virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
a6068c8700
FFmpeg/libavformat/mxfenc.c

3492 lines
137 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-15 00:48:02 +03: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 11:54:59 +02: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-15 00:48:02 +03: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: Correct the Sample rate for PCM outside D10 Based on mail from IRT Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:45 +02:00
* signal_standard, color_siting, store_user_comments, sample rate and klv_fill_key version
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 15:24:26 +02:00
* 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-15 00:48:02 +03: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 15:16:52 +03:00
* SMPTE 422M Mapping JPEG 2000 Codestreams into the MXF Generic Container
avformat/mxfenc: fix DNxHD GC element_type The values for the essence element type were updated in the spec from 0x05/0x06 (ST2019-4 2008) to 0x0C/0x0D (ST2019-4 2009). Fixes ticket #6380. Thanks-to: Philip de Nier <philip.denier@bbc.co.uk> Thanks-to: Matthieu Bouron <matthieu.bouron@gmail.com> Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> Signed-off-by: Marton Balint <cus@passwd.hu>
2021-12-14 17:27:43 +02:00
* SMPTE ST2019-4 (2009 or later) Mapping VC-3 Coding Units 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-15 00:48:02 +03: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 05:50:45 +03:00
#include <inttypes.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 22:15:18 +02: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 01:37:03 +02: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 17:35:12 +03: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 08:15:00 +02:00
#include "libavutil/random_seed.h"
mxfenc: use new public timecode API.
2012-01-16 16:19:37 +03:00
#include "libavutil/timecode.h"
mxfenc: switch to av_assert Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-13 00:16:24 +03:00
#include "libavutil/avassert.h"
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
#include "libavutil/mastering_display_metadata.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 10:46:36 +03:00
#include "libavutil/time_internal.h"
avformat/internal: Don't include avcodec.h The general demuxing API uses parsers and decoders. Therefore FFStream contains pointers to AVCodecContexts and AVCodecParserContext and lavf/internal.h includes lavc/avcodec.h. Yet actually only a few files files really use these; and it is best when this number stays small. Therefore this commit uses opaque structs in lavf/internal.h for these contexts and stops including avcodec.h. This also avoids including lavc/codec_desc.h implicitly. All other headers are implicitly included as now (mostly through codec.h). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-09-21 03:03:07 +02:00
#include "libavcodec/avcodec.h"
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
#include "libavcodec/golomb.h"
avcodec/internal.h: Move avpriv_find_start_code() to startcode.h This is by definition the appropriate place for it. Remove all the now unnecessary libavcodec/internal.h inclusions; also remove other unnecessary headers from the affected files. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-02-04 16:43:14 +02:00
#include "libavcodec/h264.h"
avcodec/packet_internal: make avpriv_packet_list_* functions use an internal struct The next pointer is kept at the end for backwards compatability until the major bump, when it should ideally be moved at the front. Signed-off-by: James Almer <jamrial@gmail.com>
2021-03-05 16:26:24 +02:00
#include "libavcodec/packet_internal.h"
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
#include "libavcodec/rangecoder.h"
avcodec/internal.h: Move avpriv_find_start_code() to startcode.h This is by definition the appropriate place for it. Remove all the now unnecessary libavcodec/internal.h inclusions; also remove other unnecessary headers from the affected files. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-02-04 16:43:14 +02:00
#include "libavcodec/startcode.h"
remove implicit header inclusions from mxf.h Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 06:42:38 +02:00
#include "avformat.h"
mxfenc: use ffio_fill() Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-15 20:39:55 +03: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 14:21:00 +03:00
#include "internal.h"
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
#include "avc.h"
avformat/internal: Move muxing-only functions to new mux.h header Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-05-06 14:39:31 +02:00
#include "mux.h"
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 21:11:00 +03: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 19:09:47 +03:00
#include "config.h"
libavformat: Split version.h Signed-off-by: Martin Storsjö <martin@martin.st>
2022-02-23 14:18:39 +02:00
#include "version.h"
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 21:11:00 +03:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
extern const FFOutputFormat ff_mxf_d10_muxer;
extern const FFOutputFormat ff_mxf_opatom_muxer;
#define IS_D10(s) ((s)->oformat == &ff_mxf_d10_muxer.p)
#define IS_OPATOM(s) ((s)->oformat == &ff_mxf_opatom_muxer.p)
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 11:02:29 +02: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 04:13:23 +02: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 12:03:38 +02:00
avformat: Don't anonymously typedef structs
2014-09-22 10:19:33 +03: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 12:03:38 +02:00
uint64_t offset;
fix doxygen Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 11:39:19 +02: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 11:35:47 +03:00
uint16_t temporal_ref;
avformat/mxfenc: Reorder fields in MXFIndexEntry to make it smaller Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-03-13 12:18:40 +02:00
uint8_t flags;
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 12:03:38 +02:00
} MXFIndexEntry;
avformat: Don't anonymously typedef structs
2014-09-22 10:19:33 +03:00
typedef struct MXFStreamContext {
avformat: implement retiming directly in mxfenc and gxfenc Generic retime functionality is replaced by a few lines of code directly in the muxers which used it, which seems a lot easier to understand and this way the retiming is not dependant of the input durations. Also remove retimeinterleave, since it is not used by anything anymore. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-04-28 00:39:40 +02:00
int64_t pkt_cnt; ///< pkt counter for muxed packets
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 15:36:17 +03: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 10:43:32 +03: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 05:41:31 +03:00
const UID *codec_ul;
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
const UID *container_ul;
cosmetics, change case and comments alignment Originally committed as revision 19305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 10:43:32 +03:00
int order; ///< interleaving order if dts are equal
Fix a bunch of common typos.
2011-10-05 15:12:42 +03: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 15:21:41 +03:00
int field_dominance; ///< tff=1, bff=2
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03: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;
avformat/mxfenc: Add vertical subsampling support Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-21 20:32:32 +02:00
int v_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 12:03:38 +02: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 14:48:45 +02: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 10:41:40 +03: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 11:02:12 +03:00
int video_bit_rate;
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
int slice_offset;
int frame_size; ///< frame size in bytes
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
int seq_closed_gop; ///< all gops in sequence are closed, used in mpeg-2 descriptor
int max_gop; ///< maximum gop size, used by mpeg-2 descriptor
int b_picture_count; ///< maximum number of consecutive b pictures, used in mpeg-2 descriptor
int low_delay; ///< low delay, used in mpeg-2 descriptor
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
int avc_intra;
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
int micro_version; ///< format micro_version, used in ffv1 descriptor
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 15:36:17 +03:00
} MXFStreamContext;
avformat: Don't anonymously typedef structs
2014-09-22 10:19:33 +03: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 04:33:28 +03: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 05:41:31 +03: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 15:58:28 +03:00
void (*write_desc)(AVFormatContext *, AVStream *);
cosmetics, Pair -> Entry Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:20:47 +03: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 04:33:28 +03:00
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
typedef struct MXFPackage {
char *name;
enum MXFMetadataSetType type;
int instance;
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
struct MXFPackage *ref;
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
} MXFPackage;
avformat/mxfenc: Replace more literal magic numbers by enum values. This also moves the enum table up as it is needed earlier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:43 +02:00
enum ULIndex {
avformat/mxfenc: Replace literal numbers by named enum values. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-29 02:13:21 +02:00
INDEX_MPEG2 = 0,
INDEX_AES3,
INDEX_WAV,
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
INDEX_D10_VIDEO,
INDEX_D10_AUDIO,
avformat/mxfenc: Replace literal numbers by named enum values. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-29 02:13:21 +02:00
INDEX_DV,
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
INDEX_DNXHD,
avformat/mxfenc: Replace literal numbers by named enum values. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-29 02:13:21 +02:00
INDEX_JPEG2000,
INDEX_H264,
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
INDEX_S436M,
avformat/mxfenc: allow muxing prores
2018-12-05 19:10:37 +02:00
INDEX_PRORES,
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
INDEX_FFV1,
avformat/mxfenc: Replace literal numbers by named enum values. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-29 02:13:21 +02:00
};
avformat/mxfenc: Replace more literal magic numbers by enum values. This also moves the enum table up as it is needed earlier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:43 +02:00
static const struct {
enum AVCodecID id;
enum ULIndex index;
} mxf_essence_mappings[] = {
{ AV_CODEC_ID_MPEG2VIDEO, INDEX_MPEG2 },
{ AV_CODEC_ID_PCM_S24LE, INDEX_AES3 },
{ AV_CODEC_ID_PCM_S16LE, INDEX_AES3 },
{ AV_CODEC_ID_DVVIDEO, INDEX_DV },
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
{ AV_CODEC_ID_DNXHD, INDEX_DNXHD },
avformat/mxfenc: Replace more literal magic numbers by enum values. This also moves the enum table up as it is needed earlier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:43 +02:00
{ AV_CODEC_ID_JPEG2000, INDEX_JPEG2000 },
{ AV_CODEC_ID_H264, INDEX_H264 },
avformat/mxfenc: allow muxing prores
2018-12-05 19:10:37 +02:00
{ AV_CODEC_ID_PRORES, INDEX_PRORES },
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
{ AV_CODEC_ID_FFV1, INDEX_FFV1 },
avformat/mxfenc: Replace more literal magic numbers by enum values. This also moves the enum table up as it is needed earlier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:43 +02:00
{ AV_CODEC_ID_NONE }
};
static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st);
static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st);
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st);
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
static void mxf_write_h264_desc(AVFormatContext *s, AVStream *st);
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
static void mxf_write_ffv1_desc(AVFormatContext *s, AVStream *st);
avformat/mxfenc: Replace more literal magic numbers by enum values. This also moves the enum table up as it is needed earlier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:43 +02:00
static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st);
static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st);
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
static void mxf_write_s436m_anc_desc(AVFormatContext *s, AVStream *st);
avformat/mxfenc: Replace more literal magic numbers by enum values. This also moves the enum table up as it is needed earlier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:43 +02:00
cosmetics, Pair -> Entry Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:20:47 +03: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 04:33:28 +03: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 05:41:31 +03: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 07:07:41 +03: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 12:54:10 +02: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 09:02:20 +02: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 12:54:10 +02: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 04:33:28 +03: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 05:41:31 +03: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 07:07:41 +03: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 12:54:10 +02:00
mxf_write_wav_desc },
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
// D-10 Video
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
{ { 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 },
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
// D-10 Audio
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
{ { 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 },
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
// DV
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 19:09:47 +03: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 },
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
// DNxHD
avformat/mxfenc: fix DNxHD GC container_ul Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Marton Balint <cus@passwd.hu>
2021-12-14 17:27:42 +02:00
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
avformat/mxfenc: fix DNxHD GC element_type The values for the essence element type were updated in the spec from 0x05/0x06 (ST2019-4 2008) to 0x0C/0x0D (ST2019-4 2009). Fixes ticket #6380. Thanks-to: Philip de Nier <philip.denier@bbc.co.uk> Thanks-to: Matthieu Bouron <matthieu.bouron@gmail.com> Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> Signed-off-by: Marton Balint <cus@passwd.hu>
2021-12-14 17:27:43 +02:00
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x0C,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 20:29:42 +03:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03: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 15:16:52 +03: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-29 00:38:22 +02: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 },
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
mxf_write_h264_desc },
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
// S436M ANC
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x0D,0x01,0x03,0x01,0x02,0x0e,0x00,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x17,0x01,0x02,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x01,0x5C,0x00 },
mxf_write_s436m_anc_desc },
avformat/mxfenc: allow muxing prores
2018-12-05 19:10:37 +02:00
// ProRes
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x1c,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x17,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x03,0x00 },
mxf_write_cdci_desc },
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
// FFV1
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x23,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x1d,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x09,0x00,0x00 },
mxf_write_ffv1_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 04:33:28 +03: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 05:41:31 +03: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 07:07:41 +03: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 12:54:10 +02: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 04:33:28 +03:00
};
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
static const UID mxf_d10_codec_uls[] = {
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, // D-10 625/50 PAL 50mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x02 }, // D-10 525/50 NTSC 50mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x03 }, // D-10 625/50 PAL 40mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x04 }, // D-10 525/50 NTSC 40mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, // D-10 625/50 PAL 30mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x06 }, // D-10 525/50 NTSC 30mb/s
};
static const UID mxf_d10_container_uls[] = {
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, // D-10 625/50 PAL 50mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x02,0x01 }, // D-10 525/50 NTSC 50mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x03,0x01 }, // D-10 625/50 PAL 40mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x04,0x01 }, // D-10 525/50 NTSC 40mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 }, // D-10 625/50 PAL 30mb/s
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x06,0x01 }, // D-10 525/50 NTSC 30mb/s
};
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
static const UID mxf_ffv1_codec_uls[] = {
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x03,0x09,0x01,0x00 }, // FFV1 version 0
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x03,0x09,0x02,0x00 }, // FFV1 version 1
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x03,0x09,0x03,0x00 }, // FFV1 version 2 (was only experimental)
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x03,0x09,0x04,0x00 }, // FFV1 version 3
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x03,0x09,0x05,0x00 }, // FFV1 version 4
};
avformat/mxfenc: allow more bits for variable part in uuid generation Also make sure we do not change the product UID. Signed-off-by: Marton Balint <cus@passwd.hu>
2022-03-14 20:13:50 +02:00
static const uint8_t product_uid[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd,0x00,0x0c,0x00,0x02};
static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff };
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:15:00 +02: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 21:11:00 +03: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 09:13:57 +02: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 05:44:21 +02: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 22:29:31 +02: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 };
header partition is open incomplete for now Originally committed as revision 15102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:06:38 +03: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 11:02:29 +02: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 06:06:38 +03:00
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03: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 22:29:31 +02: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 01:01:57 +03: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 07:12:52 +03:00
/**
* SMPTE RP210 http://www.smpte-ra.org/mdd/index.html
libavformat/mxfenc: add UID for unconstrained H.264 coded video in baseline profile Enable the MXF muxer to mux baseline H.264 video streams. Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-09 14:15:38 +02:00
* https://smpte-ra.org/sites/default/files/Labels.xml
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
*/
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 */
avformat/mxfenc: Add object model version Other tools (XFConvert at least) write this as well. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 22:16:26 +02:00
{ 0x3B07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x01,0x04,0x00,0x00,0x00}}, /* Object Model 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 07:12:52 +03:00
{ 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 */
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
{ 0x3C03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x04,0x00,0x00,0x00}}, /* Product Version */
fix version string ul Originally committed as revision 15025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 19:56:36 +03: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 07:12:52 +03: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 */
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
{ 0x3C07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x0A,0x00,0x00,0x00}}, /* Toolkit Version */
{ 0x3C08, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x06,0x01,0x00,0x00}}, /* Platform */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
// 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 22:57:12 +02: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 07:12:52 +03: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 01:45:27 +02: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 07:12:52 +03: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 04:34:26 +03: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 07:12:52 +03: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 07:22:38 +02: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 07:12:52 +03: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 09:18:00 +02: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 20:04:18 +03: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 07:12:52 +03: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 01:45:27 +02: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 20:04:18 +03: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 11:08:01 +02: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 07:22:38 +02: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 20:04:18 +03: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 */
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
{ 0x3216, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x03,0x02,0x08,0x00,0x00,0x00}}, /* Stored F2 Offset */
{ 0x3205, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x08,0x00,0x00,0x00}}, /* Sampled Width */
{ 0x3204, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x07,0x00,0x00,0x00}}, /* Sampled Height */
{ 0x3206, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x09,0x00,0x00,0x00}}, /* Sampled X Offset */
{ 0x3207, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0A,0x00,0x00,0x00}}, /* Sampled Y Offset */
write display height/width tags Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:35:09 +02: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 */
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
{ 0x320A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0D,0x00,0x00,0x00}}, /* Display X offset */
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 */
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
{ 0x3217, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x03,0x02,0x07,0x00,0x00,0x00}}, /* Display F2 offset */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:04:18 +03:00
{ 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */
avformat/mxfenc: Write transfer characteristic Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-21 22:34:20 +02:00
{ 0x3210, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x02,0x01,0x01,0x01,0x02,0x00}}, /* Transfer characteristic */
avformat/mxfenc: add Coding Equations and Color Primaries to local tags Fixes ticket #9079. Signed-off-by: Marton Balint <cus@passwd.hu>
2021-01-25 23:04:05 +02:00
{ 0x321A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x02,0x01,0x01,0x03,0x01,0x00}}, /* Coding Equations (color space) */
{ 0x3219, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x09,0x04,0x01,0x02,0x01,0x01,0x06,0x01,0x00}}, /* Color Primaries */
avformat/mxfenc: Add Stored F2 Offset / Image Start/End Offset for D10 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-18 00:09:00 +02:00
{ 0x3213, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x02,0x00,0x00,0x00,0x00}}, /* Image Start Offset */
{ 0x3214, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x03,0x00,0x00,0x00,0x00}}, /* Image End Offset */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:04:18 +03:00
{ 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 15:21:41 +03: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 08:14:39 +02: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 vertical subsampling support Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-21 20:32:32 +02:00
{ 0x3308, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x01,0x10,0x00,0x00,0x00}}, /* Vertical 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 */
avformat/mxfenc: Add Padding Bits Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-05 23:30:37 +02:00
{ 0x3307, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x04,0x00,0x00,0x00,0x00}}, /* Padding Bits */
avformat/mxfenc: add white/black ref /color range Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-05 22:53:22 +02:00
{ 0x3304, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x03,0x03,0x00,0x00,0x00}}, /* Black Ref level */
{ 0x3305, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x03,0x04,0x00,0x00,0x00}}, /* White Ref level */
{ 0x3306, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x03,0x05,0x00,0x00,0x00}}, /* Color Range */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:04:18 +03: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 07:22:38 +02: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 20:04:18 +03:00
{ 0x3D03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x01,0x01,0x01,0x00,0x00}}, /* Audio sampling rate */
avformat/mxfenc: Write Audio Ref Level for D10 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-06 21:44:23 +02:00
{ 0x3D04, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x02,0x01,0x01,0x03,0x00,0x00,0x00}}, /* Audio Ref Level */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:04:18 +03:00
{ 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 01:59:28 +02: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 12:03:38 +02: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 07:22:38 +02: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 12:03:38 +02: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 05:45:03 +02:00
// MPEG video Descriptor
{ 0x8000, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0B,0x00,0x00}}, /* BitRate */
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
{ 0x8003, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x05,0x00,0x00}}, /* LowDelay */
{ 0x8004, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x06,0x00,0x00}}, /* ClosedGOP */
{ 0x8006, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x08,0x00,0x00}}, /* MaxGOP */
write profile and level local tag in mpeg descriptor Originally committed as revision 19336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 10:49:12 +03:00
{ 0x8007, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0A,0x00,0x00}}, /* ProfileAndLevel */
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
{ 0x8008, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x09,0x00,0x00}}, /* BPictureCount */
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 06:36:54 +02: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 */
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
// 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 */
// mxf_avc_subdescriptor_local_tags
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
{ 0x8100, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x09,0x06,0x01,0x01,0x04,0x06,0x10,0x00,0x00}}, /* SubDescriptors */
{ 0x8200, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x01,0x06,0x06,0x01,0x0E,0x00,0x00}}, /* AVC Decoding Delay */
{ 0x8201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x01,0x06,0x06,0x01,0x0A,0x00,0x00}}, /* AVC Profile */
{ 0x8202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x01,0x06,0x06,0x01,0x0D,0x00,0x00}}, /* AVC Level */
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
// ff_mxf_mastering_display_local_tags
{ 0x8301, FF_MXF_MasteringDisplayPrimaries },
{ 0x8302, FF_MXF_MasteringDisplayWhitePointChromaticity },
{ 0x8303, FF_MXF_MasteringDisplayMaximumLuminance },
{ 0x8304, FF_MXF_MasteringDisplayMinimumLuminance },
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
// FFV1
{ 0xDFD9, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x01,0x06,0x0C,0x06,0x00,0x00,0x00}}, /* FFV1 Micro-version */
{ 0xDFDA, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x01,0x06,0x0C,0x05,0x00,0x00,0x00}}, /* FFV1 Version */
{ 0xDFDB, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x01,0x06,0x0C,0x01,0x00,0x00,0x00}}, /* FFV1 Initialization Metadata */
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
};
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
#define MXF_NUM_TAGS FF_ARRAY_ELEMS(mxf_local_tag_batch)
typedef struct MXFContext {
AVClass *av_class;
int64_t footer_partition_offset;
int essence_container_count;
AVRational time_base;
int header_written;
MXFIndexEntry *index_entries;
unsigned edit_units_count;
uint64_t timestamp; ///< timestamp, as year(16),month(8),day(8),hour(8),minutes(8),msec/4(8)
uint8_t slice_count; ///< index slice count minus 1 (1 if no audio, 0 otherwise)
int last_indexed_edit_unit;
uint64_t *body_partition_offset;
unsigned body_partitions_count;
int last_key_index; ///< index of last key frame
uint64_t duration;
AVTimecode tc; ///< timecode context
AVStream *timecode_track;
int timecode_base; ///< rounded time code base (25 or 30)
int edit_unit_byte_count; ///< fixed edit unit byte count
int content_package_rate; ///< content package rate in system element, see SMPTE 326M
uint64_t body_offset;
uint32_t instance_number;
uint8_t umid[16]; ///< unique material identifier
int channel_count;
int signal_standard;
uint32_t tagged_value_count;
AVRational audio_edit_rate;
int store_user_comments;
int track_instance_count; // used to generate MXFTrack uuids
int cbr_index; ///< use a constant bitrate index
uint8_t unused_tags[MXF_NUM_TAGS]; ///< local tags that we know will not be used
avformat/mxfenc: Avoid allocation for timecode track Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 23:11:22 +02:00
MXFStreamContext timecode_track_priv;
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
} MXFContext;
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 15:24:26 +02:00
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 21:11:00 +03:00
{
avformat/mxfenc: allow more bits for variable part in uuid generation Also make sure we do not change the product UID. Signed-off-by: Marton Balint <cus@passwd.hu>
2022-03-14 20:13:50 +02:00
avio_write(pb, uuid_base, 10);
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 20:28:17 +02:00
avio_wb16(pb, type);
avformat/mxfenc: allow more bits for variable part in uuid generation Also make sure we do not change the product UID. Signed-off-by: Marton Balint <cus@passwd.hu>
2022-03-14 20:13:50 +02:00
avio_wb32(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 21:11:00 +03:00
}
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:15:00 +02: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 15:36:17 +03:00
{
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:15:00 +02: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 20:28:17 +02: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 15:36:17 +03:00
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 01:01:57 +03: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 20:28:17 +02: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 01:01:57 +03:00
}
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 04:13:23 +02: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 12:04:12 +02: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 21:11:00 +03:00
{
// Determine the best BER size
avformat/mxfenc: fix warning: unused function 'klv_ber_length' [-Wunused-function] Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
2019-08-29 10:44:01 +02:00
int size = klv_ber_length(len);
if (size == 1) {
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 21:11:00 +03:00
//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 20:28:17 +02: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 21:11:00 +03:00
return 1;
}
avformat/mxfenc: fix warning: unused function 'klv_ber_length' [-Wunused-function] Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
2019-08-29 10:44:01 +02:00
size --;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 21:11:00 +03:00
// 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 20:28:17 +02: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 21:11:00 +03:00
while(size) {
cosmetics: whitespaces, empty lines Originally committed as revision 16948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:29:31 +02: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 20:28:17 +02: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 21:11:00 +03:00
}
return 0;
}
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 07:33:11 +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 20:28:17 +02: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 07:33:11 +02:00
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02: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 03:23:38 +03:00
/*
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:13:44 +03: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 03:23:38 +03:00
*/
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-05 12:11:04 +03: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-15 00:48:02 +03:00
{
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:13:44 +03:00
int i;
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 12:54:10 +02: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 07:13:44 +03:00
return -1;
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:48:02 +03:00
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
static const MXFLocalTagPair* mxf_lookup_local_tag(int tag)
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
{
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
for (int i = 0; i < MXF_NUM_TAGS; i++) {
if (mxf_local_tag_batch[i].local_tag == tag) {
return &mxf_local_tag_batch[i];
}
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
// this assert can only be hit during development
av_assert0(0 && "you forgot to add your new tag to mxf_local_tag_batch");
avformat/mxfenc: add a return at the end of non-void functions Fixes compilation with GCC 11 when configured with --disable-optimizations Signed-off-by: James Almer <jamrial@gmail.com>
2021-08-06 15:29:33 +02:00
return NULL;
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
}
static void mxf_mark_tag_unused(MXFContext *mxf, int tag)
{
const MXFLocalTagPair *pair = mxf_lookup_local_tag(tag);
mxf->unused_tags[pair - mxf_local_tag_batch] = 1;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +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 07:12:52 +03: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 21:11:00 +03: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 15:24:26 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
int local_tag_number = MXF_NUM_TAGS, i;
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
int will_have_avc_tags = 0, will_have_mastering_tags = 0, will_have_ffv1_tags = 0;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 21:11:00 +03:00
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
for (i = 0; i < s->nb_streams; i++) {
MXFStreamContext *sc = s->streams[i]->priv_data;
if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_H264 && !sc->avc_intra) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
will_have_avc_tags = 1;
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
}
if (av_stream_get_side_data(s->streams[i], AV_PKT_DATA_MASTERING_DISPLAY_METADATA, NULL)) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
will_have_mastering_tags = 1;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_FFV1) {
will_have_ffv1_tags = 1;
}
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
if (!mxf->store_user_comments) {
mxf_mark_tag_unused(mxf, 0x4406);
mxf_mark_tag_unused(mxf, 0x5001);
mxf_mark_tag_unused(mxf, 0x5003);
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
if (!will_have_avc_tags && !will_have_ffv1_tags) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_mark_tag_unused(mxf, 0x8100);
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
}
if (!will_have_avc_tags) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_mark_tag_unused(mxf, 0x8200);
mxf_mark_tag_unused(mxf, 0x8201);
mxf_mark_tag_unused(mxf, 0x8202);
}
if (!will_have_mastering_tags) {
mxf_mark_tag_unused(mxf, 0x8301);
mxf_mark_tag_unused(mxf, 0x8302);
mxf_mark_tag_unused(mxf, 0x8303);
mxf_mark_tag_unused(mxf, 0x8304);
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
if (!will_have_ffv1_tags) {
mxf_mark_tag_unused(mxf, 0xDFD9);
mxf_mark_tag_unused(mxf, 0xDFDA);
mxf_mark_tag_unused(mxf, 0xDFDB);
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
for (i = 0; i < MXF_NUM_TAGS; i++) {
if (mxf->unused_tags[i]) {
local_tag_number--;
}
}
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +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 20:28:17 +02: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 21:11:00 +03: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 20:28:17 +02: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 21:11:00 +03:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
for (i = 0; i < MXF_NUM_TAGS; i++) {
if (mxf->unused_tags[i] == 0) {
avio_wb16(pb, mxf_local_tag_batch[i].local_tag);
avio_write(pb, mxf_local_tag_batch[i].uid, 16);
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 15:24:26 +02:00
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +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 21:11:00 +03:00
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
static void mxf_write_local_tag(AVFormatContext *s, 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 21:11:00 +03:00
{
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
MXFContext *mxf = s->priv_data;
AVIOContext *pb = s->pb;
const MXFLocalTagPair *pair = mxf_lookup_local_tag(tag);
// make sure the tag was not declared unnecessary upfront
av_assert0(mxf->unused_tags[pair - mxf_local_tag_batch] == 0);
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 20:28:17 +02: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 21:11:00 +03:00
}
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 15:36:17 +03: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 20:28:17 +02: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 15:36:17 +03:00
}
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
static const MXFCodecUL *mxf_get_codec_ul_by_id(const MXFCodecUL *uls, int id)
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:48:02 +03:00
{
reuse MXFCodecUL for data def and simplify Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 07:12:30 +02:00
while (uls->uid[0]) {
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
if (id == uls->id)
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:48:02 +03: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 01:58:49 +03:00
uls++;
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:48:02 +03: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 11:23:59 +03: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 03:28:36 +03: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 18:58:25 +03: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 03:23:38 +03:00
MXFContext *c = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 03:23:38 +03: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 18:58:25 +03: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 11:23:59 +03: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 03:28:51 +03:00
av_log(s,AV_LOG_DEBUG, "essence container count:%d\n", c->essence_container_count);
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
for (i = 0; i < s->nb_streams; i++) {
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:46:03 +02:00
MXFStreamContext *sc = s->streams[i]->priv_data;
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
// check first track of essence container type and only write it once
if (sc->track_essence_element_key[15] != 0)
continue;
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
avio_write(pb, *sc->container_ul, 16);
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
if (c->essence_container_count == 1)
break;
reindent Originally committed as revision 15076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:28:51 +03: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 11:23:59 +03: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 18:58:25 +03: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 07:12:52 +03: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 12:04:12 +02: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 07:12:52 +03:00
mxf_write_metadata_key(pb, 0x012f00);
PRINT_KEY(s, "preface key", pb->buf_ptr - 16);
avformat/mxfenc: Add object model version Other tools (XFConvert at least) write this as well. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 22:16:26 +02:00
klv_encode_ber_length(pb, 138 + 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 07:12:52 +03:00
// write preface set uid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
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 22:15:18 +02:00
// last modified date
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 07:12:52 +03:00
// write version
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 2, 0x3B05);
avformat/mxfenc: Bump minor versions for S377-1-2009 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-08 21:24:15 +02:00
avio_wb16(pb, 259); // v1.3
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
avformat/mxfenc: Add object model version Other tools (XFConvert at least) write this as well. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 22:16:26 +02:00
// Object Model Version
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3B07);
avformat/mxfenc: Add object model version Other tools (XFConvert at least) write this as well. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 22:16:26 +02:00
avio_wb32(pb, 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 07:12:52 +03:00
// write identification_refs
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16 + 8, 0x3B06);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
mxf_write_refs_count(pb, 1);
mxf_write_uuid(pb, Identification, 0);
// write content_storage_refs
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3B03);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
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 06:53:41 +02:00
// operational pattern
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3B09);
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s))
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
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 07:12:52 +03:00
// write essence_container_refs
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 03:28:36 +03: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 07:12:52 +03:00
// write dm_scheme_refs
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 07:12:52 +03:00
}
write strings as utf16be Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:23:11 +03: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 20:59:11 +02: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 20:59:11 +02: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 01:23:11 +03:00
*/
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
static void mxf_write_local_tag_utf16(AVFormatContext *s, int tag, const char *value)
write strings as utf16be Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:23:11 +03:00
{
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
AVIOContext *pb = s->pb;
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 20:59:11 +02: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;
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:59:11 +02: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 01:23:11 +03:00
}
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
static void store_version(AVFormatContext *s){
AVIOContext *pb = s->pb;
if (s->flags & AVFMT_FLAG_BITEXACT) {
avio_wb16(pb, 0); // major
avio_wb16(pb, 0); // minor
avio_wb16(pb, 0); // tertiary
} else {
avio_wb16(pb, LIBAVFORMAT_VERSION_MAJOR); // major
avio_wb16(pb, LIBAVFORMAT_VERSION_MINOR); // minor
avio_wb16(pb, LIBAVFORMAT_VERSION_MICRO); // tertiary
}
avio_wb16(pb, 0); // patch
avio_wb16(pb, 0); // release
}
avformat/mxfenc: Fix typo Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2021-02-15 17:58:44 +02:00
#define PLATFORM_IDENT "Lavf " AV_STRINGIFY((OS_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 07:12:52 +03: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 22:15:18 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
avformat/mxfenc: prefer to use the configured metadata The metadata company_name, product_name, product_version from input file will be deleted to avoid overwriting information Please to test with below commands: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf and ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy \ -metadata company_name="xxx" \ -metadata product_name="xxx" \ -metadata product_version="xxx" \ out.mxf Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
2021-02-02 14:41:22 +02:00
AVDictionaryEntry *com_entry = av_dict_get(s->metadata, "company_name", NULL, 0);
AVDictionaryEntry *product_entry = av_dict_get(s->metadata, "product_name", NULL, 0);
AVDictionaryEntry *version_entry = av_dict_get(s->metadata, "product_version", NULL, 0);
const char *company = com_entry ? com_entry->value : "FFmpeg";
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
const char *product = product_entry ? product_entry->value : !IS_OPATOM(s) ? "OP1a Muxer" : "OPAtom Muxer";
avformat/mxfenc: Fix typo Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2021-02-15 17:58:44 +02:00
const char *platform = s->flags & AVFMT_FLAG_BITEXACT ? "Lavf" : PLATFORM_IDENT;
avformat/mxfenc: Use user-specified version even when bitexact Doing so is still bitexact. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2021-02-15 17:54:59 +02:00
const char *version = version_entry ? version_entry->value :
s->flags & AVFMT_FLAG_BITEXACT ? "0.0.0" :
AV_STRINGIFY(LIBAVFORMAT_VERSION);
simplify, and factorize Originally committed as revision 15062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:45:32 +03: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 07:12:52 +03:00
mxf_write_metadata_key(pb, 0x013000);
PRINT_KEY(s, "identification key", pb->buf_ptr - 16);
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
length = 100 +mxf_utf16_local_tag_length(company) +
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 20:59:11 +02:00
mxf_utf16_local_tag_length(product) +
avformat/mxf: add platform local tag Please check the string of platform with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf ./ffmpeg -i out.mxf .... application_platform: Lavf (linux) Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
2021-02-02 01:17:44 +02:00
mxf_utf16_local_tag_length(platform) +
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 20:59:11 +02:00
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 07:12:52 +03:00
klv_encode_ber_length(pb, length);
// write uid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
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 01:45:49 +03: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 07:12:52 +03:00
// write generation uid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C09);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
mxf_write_uuid(pb, Identification, 1);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag_utf16(s, 0x3C01, company); // Company Name
mxf_write_local_tag_utf16(s, 0x3C02, product); // Product Name
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 10, 0x3C03); // Product Version
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
store_version(s);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag_utf16(s, 0x3C04, version); // Version String
avformat/mxf: add platform local tag Please check the string of platform with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf ./ffmpeg -i out.mxf .... application_platform: Lavf (linux) Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
2021-02-02 01:17:44 +02:00
mxf_write_local_tag_utf16(s, 0x3C08, platform); // Platform
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
// write product uid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C05);
avformat/mxfenc: allow more bits for variable part in uuid generation Also make sure we do not change the product UID. Signed-off-by: Marton Balint <cus@passwd.hu>
2022-03-14 20:13:50 +02:00
avio_write(pb, product_uid, 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 07:12:52 +03:00
use timestamp as modification date Originally committed as revision 17010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:30:01 +02:00
// modification date
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02:00
avio_wb64(pb, mxf->timestamp);
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 10, 0x3C07); // Toolkit Version
avformat/mxfenc: Add Product Version, Toolkit version and Platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-17 17:01:15 +02:00
store_version(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 07:12:52 +03:00
}
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
static void mxf_write_content_storage(AVFormatContext *s, MXFPackage *packages, int package_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 07:12:52 +03:00
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
int 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 07:12:52 +03:00
mxf_write_metadata_key(pb, 0x011800);
PRINT_KEY(s, "content storage key", pb->buf_ptr - 16);
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
klv_encode_ber_length(pb, 60 + (16 * package_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 07:12:52 +03:00
// write uid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
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 01:58:49 +03: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 07:12:52 +03:00
// write package reference
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16 * package_count + 8, 0x1901);
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
mxf_write_refs_count(pb, package_count);
for (i = 0; i < package_count; i++) {
mxf_write_uuid(pb, packages[i].type, packages[i].instance);
}
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02:00
// write essence container data
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 8 + 16, 0x1902);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02:00
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 07:12:52 +03:00
}
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
static void mxf_write_track(AVFormatContext *s, AVStream *st, MXFPackage *package)
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 08:55:46 +03:00
{
use sample rate as audio input time base Originally committed as revision 16985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 06:50:47 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
merge declaration and init Originally committed as revision 15077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:36:30 +03: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 08:55:46 +03: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
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf_write_uuid(pb, Track, mxf->track_instance_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 08:55:46 +03: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 01:58:49 +03: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 08:55:46 +03:00
// write track id
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 08:55:46 +03: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 04:33:28 +03:00
// write track number
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x4804);
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
if (package->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 20:28:17 +02: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 04:33:28 +03: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 20:28:17 +02: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 08:55:46 +03:00
avformat/mxfenc: Comment edit rate write code like the surrounding code Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:44 +02:00
// write edit rate
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (st == mxf->timecode_track && IS_OPATOM(s)) {
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_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 08:55:46 +03:00
// write origin
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 08:55:46 +03:00
// write sequence refs
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x4803);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf_write_uuid(pb, Sequence, mxf->track_instance_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 08:55:46 +03:00
}
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02: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 01:01:57 +03:00
{
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 05:46:50 +03:00
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
// find data define uls
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x0201);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02: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 20:28:17 +02: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 09:18:00 +02:00
else {
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
const MXFCodecUL *data_def_ul = mxf_get_codec_ul_by_id(ff_mxf_data_definition_uls, 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 20:28:17 +02: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 09:18:00 +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 01:01:57 +03:00
// write duration
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (st != mxf->timecode_track && IS_OPATOM(s) && 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 01:01:57 +03:00
}
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
static void mxf_write_sequence(AVFormatContext *s, AVStream *st, MXFPackage *package)
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 08:55:46 +03:00
{
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02: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 08:55:46 +03:00
mxf_write_metadata_key(pb, 0x010f00);
PRINT_KEY(s, "sequence key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 80);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf_write_uuid(pb, Sequence, mxf->track_instance_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 08:55:46 +03: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 09:18:00 +02: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 08:55:46 +03:00
// write structural component
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16 + 8, 0x1001);
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 08:55:46 +03:00
mxf_write_refs_count(pb, 1);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02: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 03:35:36 +02:00
component = SourceClip;
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf_write_uuid(pb, component, mxf->track_instance_count);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
}
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
static void mxf_write_timecode_component(AVFormatContext *s, AVStream *st, MXFPackage *package)
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
mxf_write_metadata_key(pb, 0x011400);
klv_encode_ber_length(pb, 75);
// UID
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf_write_uuid(pb, TimecodeComponent, mxf->track_instance_count);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
mxf_write_common_fields(s, st);
// Start Time Code
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 17:35:12 +03: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 09:18:00 +02:00
// Rounded Time Code Base
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 09:18:00 +02:00
// Drop Frame
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x1503);
mxfenc: use new public timecode API.
2012-01-16 16:19:37 +03: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 08:55:46 +03:00
}
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
static void mxf_write_structural_component(AVFormatContext *s, AVStream *st, MXFPackage *package)
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 08:55:46 +03:00
{
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 08:55:46 +03:00
mxf_write_metadata_key(pb, 0x011100);
PRINT_KEY(s, "sturctural component key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 108);
// write uid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf_write_uuid(pb, SourceClip, mxf->track_instance_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 08:55:46 +03: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 09:18:00 +02: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 08:55:46 +03:00
// write start_position
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 08:55:46 +03: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 01:58:49 +03:00
// write source package uid, end of the reference
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 32, 0x1101);
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
if (!package->ref) {
avformat/mxfenc: Simplfy writing padding Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-09-23 02:16:41 +02:00
ffio_fill(pb, 0, 32);
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 08:55:46 +03:00
} else
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
mxf_write_umid(s, package->ref->instance);
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 08:55:46 +03: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 01:58:49 +03:00
// write source track id
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x1102);
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
if (package->type == SourcePackage && !package->ref)
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 20:28:17 +02: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 08:55:46 +03: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 20:28:17 +02: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 08:55:46 +03:00
}
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
static void mxf_write_tape_descriptor(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
mxf_write_metadata_key(pb, 0x012e00);
PRINT_KEY(s, "tape descriptor key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 20);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
mxf_write_uuid(pb, TapeDescriptor, 0);
PRINT_KEY(s, "tape_desc uid", pb->buf_ptr - 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 07:12:52 +03: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 11:35:59 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 07:12:52 +03: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 18:06:49 +03: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 07:12:52 +03:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
mxf_write_uuid(pb, MultipleDescriptor, 0);
PRINT_KEY(s, "multi_desc uid", pb->buf_ptr - 16);
// write sample rate
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 07:12:52 +03:00
// write essence container ul
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3004);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 09:46:03 +02:00
else {
MXFStreamContext *sc = s->streams[0]->priv_data;
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
ul = *sc->container_ul;
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:46:03 +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 20:28:17 +02: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 07:12:52 +03:00
// write sub descriptor refs
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, s->nb_streams * 16 + 8, 0x3F01);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 07:12:52 +03:00
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 01:58:49 +03: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 07:12:52 +03:00
mxf_write_uuid(pb, SubDescriptor, i);
}
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
static int64_t mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UID key)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
{
always write mxf time base in descriptors Originally committed as revision 16987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 11:35:59 +02: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 02:54:24 +03:00
MXFStreamContext *sc = st->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03: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 20:28:17 +02:00
avio_write(pb, key, 16);
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
klv_encode_ber4_length(pb, 0);
pos = avio_tell(pb);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
mxf_write_uuid(pb, SubDescriptor, st->index);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 01:01:57 +03:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 8, 0x3001);
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s)) {
avformat/mxfenc: Correct the Sample rate for PCM outside D10 Based on mail from IRT Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-10 22:10:45 +02:00
avio_wb32(pb, mxf->time_base.den);
avio_wb32(pb, mxf->time_base.num);
} else {
if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE ||
st->codecpar->codec_id == AV_CODEC_ID_PCM_S24LE) {
avio_wb32(pb, st->codecpar->sample_rate);
avio_wb32(pb, 1);
} else {
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 07:12:52 +03:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3004);
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
avio_write(pb, *sc->container_ul, 16);
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
return pos;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
}
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
static const UID mxf_s436m_anc_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x5c,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 07:07:41 +03: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 09:02:20 +02: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 09:28:20 +02:00
static const UID mxf_cdci_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01,0x01,0x28,0x00 };
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
static const UID mxf_rgba_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01,0x01,0x29,0x00 };
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
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 07:07:41 +03:00
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
static const UID mxf_avc_subdescriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x6E,0x00 };
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
static const UID mxf_ffv1_subdescriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x81,0x03 };
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
static inline uint16_t rescale_mastering_chroma(AVRational q)
{
return av_clip_uint16(av_rescale(q.num, FF_MXF_MASTERING_CHROMA_DEN, q.den));
}
static inline uint32_t rescale_mastering_luma(AVRational q)
{
return av_rescale(q.num, FF_MXF_MASTERING_LUMA_DEN, q.den);
}
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
{
stored height is stupidly /2 if interlaced Originally committed as revision 16891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:46:42 +02:00
MXFStreamContext *sc = st->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
int stored_width = st->codecpar->width;
int stored_height = st->codecpar->height;
int display_width;
store display height without vbi Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:13:36 +02: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 11:23:50 +02:00
int f1, f2;
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
const MXFCodecUL *color_primaries_ul;
const MXFCodecUL *color_trc_ul;
const MXFCodecUL *color_space_ul;
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_generic_desc(s, st, key);
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
uint8_t *side_data;
avformat/mxfenc: Write transfer characteristic Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-21 22:34:20 +02:00
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
color_primaries_ul = mxf_get_codec_ul_by_id(ff_mxf_color_primaries_uls, st->codecpar->color_primaries);
color_trc_ul = mxf_get_codec_ul_by_id(ff_mxf_color_trc_uls, st->codecpar->color_trc);
color_space_ul = mxf_get_codec_ul_by_id(ff_mxf_color_space_uls, st->codecpar->color_space);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
avformat/mxfenc: correctly set width values for dvcprohd
2019-08-26 22:15:32 +02:00
if (st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO) {
if (st->codecpar->height == 1080)
stored_width = 1920;
else if (st->codecpar->height == 720)
stored_width = 1280;
}
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
display_width = stored_width;
switch (st->codecpar->codec_id) {
case AV_CODEC_ID_MPEG2VIDEO:
case AV_CODEC_ID_H264:
//Based on 16x16 macroblocks
stored_width = (stored_width+15)/16*16;
stored_height = (stored_height+15)/16*16;
break;
default:
break;
}
avformat/mxfenc: correctly set width values for dvcprohd
2019-08-26 22:15:32 +02:00
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
//Stored width
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3203);
avformat/mxfenc: Fix stored width This fixes the width to have computations matching the height Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:04:50 +02:00
avio_wb32(pb, stored_width);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
//Stored height
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 01:01:57 +03:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s)) {
avformat/mxfenc: Add Stored F2 Offset / Image Start/End Offset for D10 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-18 00:09:00 +02:00
//Stored F2 Offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3216);
avformat/mxfenc: Add Stored F2 Offset / Image Start/End Offset for D10 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-18 00:09:00 +02:00
avio_wb32(pb, 0);
//Image Start Offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3213);
avformat/mxfenc: Add Stored F2 Offset / Image Start/End Offset for D10 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-18 00:09:00 +02:00
avio_wb32(pb, 0);
//Image End Offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3214);
avformat/mxfenc: Add Stored F2 Offset / Image Start/End Offset for D10 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-18 00:09:00 +02:00
avio_wb32(pb, 0);
}
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
//Sampled width
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3205);
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
avio_wb32(pb, display_width);
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
//Samples height
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3204);
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
avio_wb32(pb, st->codecpar->height>>sc->interlaced);
//Sampled X Offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3206);
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
avio_wb32(pb, 0);
//Sampled Y Offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3207);
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
avio_wb32(pb, 0);
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
//Display width
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3209);
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
avio_wb32(pb, display_width);
write display height/width tags Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:35:09 +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 21:42:52 +03: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 09:13:36 +02: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 21:42:52 +03: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 09:13:36 +02: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 21:42:52 +03: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 09:13:36 +02:00
avformat/mxfenc: fix stored/sampled/displayed width/height According to MXF specs the Stored Rectangle corresponds to the data which is passed to the compressor and received from the decompressor, so they should contain the width / height extended to the macroblock boundary. In practice however width and height values rounded to the upper 16 multiples are only seen when muxing MPEG formats. Therefore this patch changes stored width and height values to unrounded for all non-MPEG formats, even macroblock based ones. For DNXHD the specs (ST 2019-4) explicitly indicates to use 1080 for 1088p. For ProRes the specs (RDD 44) only refer to to ST 377-1 without precision but no known commercial implementations are using rounded values. DV is not using 16x16 macroblocks, so 16 rounding makes no sense. The patch also fixes Sampled Width / Display Width to use unrounded values. Signed-off-by: Marton Balint <cus@passwd.hu>
2023-01-14 14:32:36 +02:00
//Display height
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 05:35:09 +02:00
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
// display X offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x320A);
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
avio_wb32(pb, 0);
// display Y offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
if (sc->interlaced) {
//Display F2 Offset
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x3217);
avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-18 00:06:13 +02:00
avio_wb32(pb, -((st->codecpar->height - display_height)&1));
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
if (key != mxf_rgba_descriptor_key) {
avformat/mxfenc: reindent after last mxfenc commit Signed-off-by: Marton Balint <cus@passwd.hu>
2023-03-26 21:38:26 +02:00
// component depth
mxf_write_local_tag(s, 4, 0x3301);
avio_wb32(pb, sc->component_depth);
// horizontal subsampling
mxf_write_local_tag(s, 4, 0x3302);
avio_wb32(pb, sc->h_chroma_sub_sample);
// vertical subsampling
mxf_write_local_tag(s, 4, 0x3308);
avio_wb32(pb, sc->v_chroma_sub_sample);
// color siting
mxf_write_local_tag(s, 1, 0x3303);
avio_w8(pb, sc->color_siting);
// Padding Bits
mxf_write_local_tag(s, 2, 0x3307);
avio_wb16(pb, 0);
if (st->codecpar->color_range != AVCOL_RANGE_UNSPECIFIED) {
int black = 0,
white = (1<<sc->component_depth) - 1,
color = (1<<sc->component_depth);
if (st->codecpar->color_range == AVCOL_RANGE_MPEG) {
black = 1 << (sc->component_depth - 4);
white = 235 << (sc->component_depth - 8);
color = (14 << (sc->component_depth - 4)) + 1;
}
mxf_write_local_tag(s, 4, 0x3304);
avio_wb32(pb, black);
mxf_write_local_tag(s, 4, 0x3305);
avio_wb32(pb, white);
mxf_write_local_tag(s, 4, 0x3306);
avio_wb32(pb, color);
avformat/mxfenc: add white/black ref /color range Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-05 22:53:22 +02:00
}
}
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) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x3215);
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
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 11:08:01 +02:00
// frame layout
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 11:08:01 +02:00
write best effort video line map Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 11:23:50 +02: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 21:42:52 +03: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 11:23:50 +02: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 11:23:50 +02: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;
}
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
if (!sc->interlaced && f2) {
write best effort video line map Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 11:23:50 +02:00
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 18:45:05 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x320D);
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 18:45:05 +02:00
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 20:28:17 +02: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 18:45:05 +02: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 11:23:50 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 08:49:42 +02:00
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
if (color_primaries_ul->uid[0]) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3219);
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
avio_write(pb, color_primaries_ul->uid, 16);
};
if (color_trc_ul->uid[0]) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3210);
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
avio_write(pb, color_trc_ul->uid, 16);
};
if (color_space_ul->uid[0]) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x321A);
avformat/mxfenc: Write color metadata to MXF Writes color_primaries, color_trc and color_space to mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06 16:27:48 +02:00
avio_write(pb, color_space_ul->uid, 16);
avformat/mxfenc: Write transfer characteristic Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-21 22:34:20 +02:00
};
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 15:21:41 +03:00
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
// Mastering Display metadata
side_data = av_stream_get_side_data(st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, NULL);
if (side_data) {
const AVMasteringDisplayMetadata *metadata = (const AVMasteringDisplayMetadata*)side_data;
if (metadata->has_primaries) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 12, 0x8301);
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[0][0]));
avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[0][1]));
avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[1][0]));
avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[1][1]));
avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[2][0]));
avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[2][1]));
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x8302);
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
avio_wb16(pb, rescale_mastering_chroma(metadata->white_point[0]));
avio_wb16(pb, rescale_mastering_chroma(metadata->white_point[1]));
} else {
av_log(NULL, AV_LOG_VERBOSE, "Not writing mastering display primaries. Missing data.\n");
}
if (metadata->has_luminance) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x8303);
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
avio_wb32(pb, rescale_mastering_luma(metadata->max_luminance));
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x8304);
avformat/mxfenc: Write Mastering Display Colour Volume to MXF Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-09-09 16:56:38 +02:00
avio_wb32(pb, rescale_mastering_luma(metadata->min_luminance));
} else {
av_log(NULL, AV_LOG_VERBOSE, "Not writing mastering display luminances. Missing data.\n");
}
}
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 15:21:41 +03:00
if (sc->interlaced && sc->field_dominance) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x3212);
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 15:21:41 +03:00
avio_w8(pb, sc->field_dominance);
}
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
if (st->codecpar->codec_id == AV_CODEC_ID_H264 && !sc->avc_intra) {
// write avc sub descriptor ref
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 8 + 16, 0x8100);
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
mxf_write_refs_count(pb, 1);
mxf_write_uuid(pb, AVCSubDescriptor, 0);
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
if (st->codecpar->codec_id == AV_CODEC_ID_FFV1) {
// write ffv1 sub descriptor ref
mxf_write_local_tag(s, 8 + 16, 0x8100);
mxf_write_refs_count(pb, 1);
mxf_write_uuid(pb, FFV1SubDescriptor, 0);
}
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
return pos;
}
static void mxf_update_klv_size(AVIOContext *pb, int64_t pos)
{
int64_t cur_pos = avio_tell(pb);
int size = cur_pos - pos;
avio_seek(pb, pos - 4, SEEK_SET);
klv_encode_ber4_length(pb, size);
avio_seek(pb, cur_pos, SEEK_SET);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
}
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
static void mxf_write_avc_subdesc(AVFormatContext *s, AVStream *st)
{
AVIOContext *pb = s->pb;
int64_t pos;
avio_write(pb, mxf_avc_subdescriptor_key, 16);
klv_encode_ber4_length(pb, 0);
pos = avio_tell(pb);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
mxf_write_uuid(pb, AVCSubDescriptor, 0);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x8200);
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
avio_w8(pb, 0xFF); // AVC Decoding Delay, unknown
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x8201);
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
avio_w8(pb, st->codecpar->profile); // AVC Profile
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x8202);
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
avio_w8(pb, st->codecpar->level); // AVC Level
mxf_update_klv_size(s->pb, pos);
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st)
{
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key);
mxf_update_klv_size(s->pb, pos);
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
if (st->codecpar->codec_id == AV_CODEC_ID_H264) {
mxf_write_avc_subdesc(s, st);
}
}
static void mxf_write_h264_desc(AVFormatContext *s, AVStream *st)
{
MXFStreamContext *sc = st->priv_data;
if (sc->avc_intra) {
mxf_write_mpegvideo_desc(s, st);
} else {
int64_t pos = mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key);
mxf_update_klv_size(s->pb, pos);
mxf_write_avc_subdesc(s, st);
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
static void mxf_write_ffv1_subdesc(AVFormatContext *s, AVStream *st)
{
AVIOContext *pb = s->pb;
MXFStreamContext *sc = st->priv_data;
int64_t pos;
avio_write(pb, mxf_ffv1_subdescriptor_key, 16);
klv_encode_ber4_length(pb, 0);
pos = avio_tell(pb);
mxf_write_local_tag(s, 16, 0x3C0A);
mxf_write_uuid(pb, FFV1SubDescriptor, 0);
if (st->codecpar->extradata_size) {
mxf_write_local_tag(s, st->codecpar->extradata_size, 0xDFDB);
avio_write(pb, st->codecpar->extradata, st->codecpar->extradata_size); // FFV1InitializationMetadata
}
mxf_write_local_tag(s, 2, 0xDFDA);
avio_wb16(pb, (*sc->codec_ul)[14]); // FFV1Version
if (st->codecpar->extradata_size) {
mxf_write_local_tag(s, 2, 0xDFD9);
avio_wb16(pb, sc->micro_version); // FFV1MicroVersion
}
mxf_update_klv_size(s->pb, pos);
}
static void mxf_write_ffv1_desc(AVFormatContext *s, AVStream *st)
{
int is_rgb, pos;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(st->codecpar->format);
av_assert0(desc);
is_rgb = desc->flags & AV_PIX_FMT_FLAG_RGB;
pos = mxf_write_cdci_common(s, st, is_rgb ? mxf_rgba_descriptor_key : mxf_cdci_descriptor_key);
mxf_update_klv_size(s->pb, pos);
mxf_write_ffv1_subdesc(s, st);
}
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
static void mxf_write_s436m_anc_desc(AVFormatContext *s, AVStream *st)
{
int64_t pos = mxf_write_generic_desc(s, st, mxf_s436m_anc_descriptor_key);
mxf_update_klv_size(s->pb, pos);
}
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 09:11:21 +02: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 12:04:12 +02: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 11:02:12 +03: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 21:42:52 +03:00
int profile_and_level = (st->codecpar->profile<<4) | st->codecpar->level;
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key);
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 09:11:21 +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->codecpar->codec_id != AV_CODEC_ID_H264) {
mxfenc: fix indentation after last commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 22:26:25 +02:00
// bit rate
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 4, 0x8000);
mxfenc: fix indentation after last commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 22:26:25 +02:00
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 10:49:12 +03:00
mxfenc: fix indentation after last commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 22:26:25 +02:00
// profile and level
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 22:26:25 +02:00
profile_and_level |= 0x80; // escape bit
avio_w8(pb, profile_and_level);
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
// low delay
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x8003);
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
avio_w8(pb, sc->low_delay);
// closed gop
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x8004);
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
avio_w8(pb, sc->seq_closed_gop);
// max gop
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 2, 0x8006);
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
avio_wb16(pb, sc->max_gop);
// b picture count
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 2, 0x8008);
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
avio_wb16(pb, sc->b_picture_count);
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-29 00:38:22 +02:00
}
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
mxf_update_klv_size(pb, pos);
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 09:11:21 +02:00
}
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
static int64_t mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 13:29:30 +03:00
MXFContext *mxf = s->priv_data;
int show_warnings = !mxf->footer_partition_offset;
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_generic_desc(s, st, key);
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
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s)) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 8, 0x3002);
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);
}
thanks to interleaving, audio is now locked Originally committed as revision 16893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:54:30 +02:00
split wav_desc in generic_sound_desc Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:59:55 +02:00
// audio locked
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 01:01:57 +03:00
// write audio sampling rate
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 21:42:52 +03: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 20:28:17 +02: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 01:01:57 +03:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s)) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x3D04);
avformat/mxfenc: Write Audio Ref Level for D10 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-06 21:44:23 +02:00
avio_w8(pb, 0);
}
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 13:29:30 +03:00
if (mxf->channel_count == -1) {
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (show_warnings && IS_D10(s) &&
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
(st->codecpar->ch_layout.nb_channels != 4) &&
(st->codecpar->ch_layout.nb_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 19:10:45 +03: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");
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
avio_wb32(pb, st->codecpar->ch_layout.nb_channels);
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
} else if (IS_D10(s)) {
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
if (show_warnings && (mxf->channel_count < st->codecpar->ch_layout.nb_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 19:10:45 +03: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 13:29:30 +03: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 19:10:45 +03: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 13:29:30 +03:00
avio_wb32(pb, mxf->channel_count);
} else {
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
avio_wb32(pb, st->codecpar->ch_layout.nb_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 13:29:30 +03:00
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 21:42:52 +03:00
avio_wb32(pb, av_get_bits_per_sample(st->codecpar->codec_id));
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
return pos;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
}
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
static int64_t mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key)
split wav_desc in generic_sound_desc Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:59:55 +02:00
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_generic_sound_common(s, st, key);
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 06:36:54 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 21:42:52 +03: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 06:36:54 +02:00
// avg bytes per sec
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 21:42:52 +03:00
avio_wb32(pb, st->codecpar->block_align*st->codecpar->sample_rate);
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
return pos;
split wav_desc in generic_sound_desc Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:59:55 +02:00
}
factorize common wav local tags Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 06:40:57 +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 09:02:20 +02:00
{
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_wav_common(s, st, mxf_wav_descriptor_key);
mxf_update_klv_size(s->pb, pos);
factorize common wav local tags Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 06:40:57 +02:00
}
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 06:36:54 +02:00
factorize common wav local tags Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 06:40:57 +02:00
static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st)
{
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_wav_common(s, st, mxf_aes3_descriptor_key);
mxf_update_klv_size(s->pb, pos);
add aes3 pcm wrapping and use it by default Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:02:20 +02:00
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st)
{
avformat/mxfenc: automatically update descriptors klv size
2018-03-21 17:37:59 +02:00
int64_t pos = mxf_write_generic_sound_common(s, st, mxf_generic_sound_descriptor_key);
mxf_update_klv_size(s->pb, pos);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 02:59:50 +02: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
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
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 02:59:50 +02:00
mxf_write_uuid(pb, TaggedValue, mxf->tagged_value_count);
// write name
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag_utf16(s, 0x5001, name); // 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 02:59:50 +02:00
// write indirect value
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, indirect_value_size, 0x5003);
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 02:59:50 +02:00
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;
}
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
static void mxf_write_package(AVFormatContext *s, MXFPackage *package)
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:24:00 +03: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 22:15:18 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 03:35:36 +02:00
int i, track_count = s->nb_streams+1;
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02: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 02:59:50 +02: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 07:24:00 +03:00
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
if (package->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 15:24:26 +02: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 07:24:00 +03: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 19:13:25 +02: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 07:24:00 +03: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 19:13:25 +02: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 07:24:00 +03:00
}
// write uid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
mxf_write_uuid(pb, package->type, package->instance);
av_log(s, AV_LOG_DEBUG, "package type:%d\n", package->type);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:24:00 +03:00
PRINT_KEY(s, "package uid", pb->buf_ptr - 16);
// write package umid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 32, 0x4401);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf_write_umid(s, package->instance);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:24:00 +03: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 20:59:11 +02:00
// package name
if (name_size)
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag_utf16(s, 0x4402, package->name);
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 20:59:11 +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 22:15:18 +02:00
// package creation date
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 07:24:00 +03: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 22:15:18 +02:00
// package modified date
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 07:24:00 +03:00
// write track refs
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, track_count*16 + 8, 0x4403);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
mxf_write_refs_count(pb, track_count);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
// these are the uuids of the tracks the will be written in mxf_write_track
for (i = 0; i < track_count; i++)
mxf_write_uuid(pb, Track, mxf->track_instance_count + i);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:24:00 +03: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 02:59:50 +02: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 15:24:26 +02:00
if (mxf->store_user_comments) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, user_comment_count*16 + 8, 0x4406);
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 15:24:26 +02:00
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 02:59:50 +02:00
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:24:00 +03:00
// write multiple descriptor reference
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
if (package->type == SourcePackage && package->instance == 1) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 07:35:09 +03:00
if (s->nb_streams > 1) {
mxf_write_uuid(pb, MultipleDescriptor, 0);
mxf_write_multi_descriptor(s);
} else
mxf_write_uuid(pb, SubDescriptor, 0);
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
} else if (package->type == SourcePackage && package->instance == 2) {
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x4701);
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
mxf_write_uuid(pb, TapeDescriptor, 0);
mxf_write_tape_descriptor(s);
factorize Originally committed as revision 15114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:26:12 +03:00
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
/*
* for every 1 track in a package there is 1 sequence and 1 component.
* all 3 of these elements share the same instance number for generating
* there instance uuids. mxf->track_instance_count stores this value.
* mxf->track_instance_count is incremented after a group of all 3 of
* these elements are written.
*/
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 03:35:36 +02:00
// write timecode track
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
mxf_write_track(s, mxf->timecode_track, package);
mxf_write_sequence(s, mxf->timecode_track, package);
mxf_write_timecode_component(s, mxf->timecode_track, package);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf->track_instance_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 03:35:36 +02:00
cosmetics, whitespace Originally committed as revision 15085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:44:45 +03: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 04:48:02 +03:00
AVStream *st = s->streams[i];
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
mxf_write_track(s, st, package);
mxf_write_sequence(s, st, package);
mxf_write_structural_component(s, st, package);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf->track_instance_count++;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:01:57 +03:00
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
if (package->type == SourcePackage && package->instance == 1) {
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 07:07:41 +03: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 07:13:44 +03: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 01:01:57 +03:00
}
}
}
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02: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 12:04:12 +02:00
AVIOContext *pb = s->pb;
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02: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 12:03:38 +02: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 22:57:12 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A); // Instance UID
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02:00
mxf_write_uuid(pb, EssenceContainerData, 0);
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 08:15:00 +02: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 22:57:12 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02:00
avio_wb32(pb, 1);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02:00
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 12:03:38 +02:00
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02: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 15:36:17 +03:00
static int mxf_write_header_metadata_sets(AVFormatContext *s)
{
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
MXFContext *mxf = s->priv_data;
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 20:59:11 +02:00
AVDictionaryEntry *entry = NULL;
AVStream *st = NULL;
int i;
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
MXFPackage packages[3] = {{0}};
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
int package_count = 2;
packages[0].type = MaterialPackage;
packages[1].type = SourcePackage;
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
packages[1].instance = 1;
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
packages[0].ref = &packages[1];
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +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 20:59:11 +02:00
if (entry = av_dict_get(s->metadata, "material_package_name", NULL, 0))
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
packages[0].name = entry->value;
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 20:59:11 +02:00
if (entry = av_dict_get(s->metadata, "file_package_name", NULL, 0)) {
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
packages[1].name = entry->value;
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 20:59:11 +02:00
} 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)) {
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
packages[1].name = entry->value;
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 20:59:11 +02:00
break;
}
}
}
avformat/mxfenc: write reel_name if metadata key is present Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:22 +02:00
entry = av_dict_get(s->metadata, "reel_name", NULL, 0);
if (entry) {
packages[2].name = entry->value;
packages[2].type = SourcePackage;
packages[2].instance = 2;
packages[1].ref = &packages[2];
package_count = 3;
}
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 01:58:49 +03: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 07:12:52 +03:00
mxf_write_identification(s);
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
mxf_write_content_storage(s, packages, package_count);
avformat/mxfenc: use track count to generate component instance uuid Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-05 06:46:21 +02:00
mxf->track_instance_count = 0;
avformat/mxfenc: pass MXFPackage around instead of type Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-27 07:42:16 +02:00
for (i = 0; i < package_count; i++)
mxf_write_package(s, &packages[i]);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:57:12 +02: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 15:36:17 +03: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 05:29:49 +02: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 04:13:23 +02: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 05:29:49 +02: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 07:33:11 +02: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 04:13:23 +02: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 11:42:37 +02: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 12:03:38 +02:00
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 11:35:47 +03: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 03:06:12 +02:00
int key_index = mxf->last_key_index;
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
int prev_non_b_picture = 0;
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
int audio_frame_size = 0;
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
int64_t pos;
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 12:03:38 +02: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 09:28:20 +02: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 11:02:29 +02: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 20:28:17 +02: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 09:28:20 +02:00
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
klv_encode_ber4_length(pb, 0);
pos = avio_tell(pb);
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 12:03:38 +02:00
// instance id
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 16, 0x3C0A);
avformat/mxfenc: do not write index tables with the same InstanceUID Only index tables repeating previous index tables should use the same InstaceUID. Use the index start position when generating the InstanceUID to fix this. Signed-off-by: Marton Balint <cus@passwd.hu>
2022-03-14 20:39:31 +02:00
mxf_write_uuid(pb, IndexTableSegment, 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 12:03:38 +02:00
// index edit rate
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 12:03:38 +02:00
// index start position
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 12:03:38 +02:00
// index duration
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 10:56:58 +03: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 20:28:17 +02: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 10:56:58 +03: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 20:28:17 +02: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 12:03:38 +02:00
// edit unit byte count
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 12:03:38 +02:00
// index sid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 12:03:38 +02:00
// body sid
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 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 20:28:17 +02: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 12:03:38 +02:00
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
// real slice count - 1
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 1, 0x3F08);
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
avio_w8(pb, !mxf->edit_unit_byte_count); // only one slice for CBR
// delta entry array
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 8 + (s->nb_streams+1)*6, 0x3F09);
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
avio_wb32(pb, s->nb_streams+1); // num of entries
avio_wb32(pb, 6); // size of one entry
// write system item delta entry
avio_w8(pb, 0);
avio_w8(pb, 0); // slice entry
avio_wb32(pb, 0); // element delta
// write each stream delta entry
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
MXFStreamContext *sc = st->priv_data;
avio_w8(pb, sc->temporal_reordering);
if (sc->temporal_reordering)
temporal_reordering = 1;
if (mxf->edit_unit_byte_count) {
avio_w8(pb, 0); // slice number
avio_wb32(pb, sc->slice_offset);
} else if (i == 0) { // video track
avio_w8(pb, 0); // slice number
avio_wb32(pb, KAG_SIZE); // system item size including klv fill
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
} else { // audio or data track
if (!audio_frame_size) {
avformat/audiointerleave: disallow using a samples_per_frame array Only MXF used an actual sample array, and that is unneeded there because simple rounding rules can be used instead. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-02-28 01:26:20 +02:00
audio_frame_size = sc->frame_size;
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
audio_frame_size += klv_fill_size(audio_frame_size);
}
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
avio_w8(pb, 1);
avio_wb32(pb, (i-1)*audio_frame_size); // element delta
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 05:29:49 +02:00
}
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +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 12:03:38 +02:00
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
if (!mxf->edit_unit_byte_count) {
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
MXFStreamContext *sc = s->streams[0]->priv_data;
avformat/mxf: Establish register of local tags Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
2021-01-27 15:08:55 +02:00
mxf_write_local_tag(s, 8 + mxf->edit_units_count*15, 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 20:28:17 +02:00
avio_wb32(pb, mxf->edit_units_count); // num of entries
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
avio_wb32(pb, 15); // 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 11:35:47 +03: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 09:34:01 +02: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 10:41:40 +03: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 11:35:47 +03: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
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
sc->max_gop = FFMAX(sc->max_gop, i - mxf->last_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 11:35:47 +03: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 09:34:01 +02: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 11:35:47 +03: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 12:41:43 +02: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 11:35:47 +03: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 12:03:38 +02:00
}
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 10:41:40 +03: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 20:28:17 +02: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 10:41:40 +03:00
if ((mxf->index_entries[i].flags & 0x30) == 0x30) { // back and forward prediction
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
sc->b_picture_count = FFMAX(sc->b_picture_count, i - prev_non_b_picture);
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 20:28:17 +02: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 09:34:01 +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 20:28:17 +02: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 09:34:01 +02:00
if ((mxf->index_entries[i].flags & 0x20) == 0x20) // only forward
mxf->last_key_index = key_index;
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
prev_non_b_picture = 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 09:34:01 +02: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 11:35:47 +03: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 11:35:47 +03: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 20:28:17 +02: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 09:34:01 +02: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 20:28:17 +02: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 09:34:01 +02: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 20:28:17 +02:00
avio_wb32(pb, mxf->index_entries[i].slice_offset);
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
else
avio_wb32(pb, 0);
fix key frame offset with open gop Originally committed as revision 16999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 09:47:39 +02:00
}
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 11:02:29 +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 09:34:01 +02: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 09:28:20 +02:00
}
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
mxf_update_klv_size(pb, pos);
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 12:03:38 +02: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 07:35:28 +02: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 21:11:45 +02: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 07:35:28 +02: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 20:28:17 +02: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 07:33:11 +02: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 20:39:55 +03:00
ffio_fill(s->pb, 0, pad);
mxfenc: switch to av_assert Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-13 00:16:24 +03: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 07:35:28 +02:00
}
}
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 20:21:24 +03: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 10:46:04 +02: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 12:03:38 +02: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 08:55:46 +03:00
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 06:42:05 +03: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 10:46:04 +02: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 21:11:45 +02: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 20:21:24 +03: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 10:46:04 +02:00
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
if (!mxf->edit_unit_byte_count && mxf->edit_units_count)
index_byte_count = 85 + 12+(s->nb_streams+1)*6 +
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
12+mxf->edit_units_count*15;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
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 09:14:23 +02:00
index_byte_count = 80;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
if (index_byte_count) {
avformat/mxfenc: fix index byte count in partition header
2019-07-18 19:35:00 +02:00
index_byte_count += 16 + 4; // add encoded ber4 length
compute index byte count in mxf_write_partition Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:46:04 +02:00
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 11:02:29 +02:00
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02: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 20:21:24 +03: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 01:25:23 +02: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 10:46:04 +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 01:58:49 +03: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 08:55:46 +03:00
// write klv
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
if (key)
avio_write(pb, key, 16);
else
avio_write(pb, body_partition_key, 16);
avformat/mxfenc: update body partition with footer offset
2018-03-21 21:59:11 +02:00
klv_encode_ber4_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 08:55:46 +03: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 20:28:17 +02:00
avio_wb16(pb, 1); // majorVersion
avformat/mxfenc: Bump minor versions for S377-1-2009 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-08 21:24:15 +02:00
avio_wb16(pb, 3); // minorVersion
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 20:28:17 +02:00
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 08:55:46 +03: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 20:28:17 +02: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 11:02:29 +02:00
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02: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 20:28:17 +02: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 05:44:21 +02: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 20:28:17 +02: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 11:02:29 +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 20:28:17 +02: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 08:55:46 +03: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 20:28:17 +02: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 08:55:46 +03: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 21:11:45 +02: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 20:28:17 +02: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 08:55:46 +03: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 12:03:38 +02: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 20:28:17 +02: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 11:02:29 +02:00
// BodyOffset
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (bodysid && mxf->edit_units_count && mxf->body_partitions_count && !IS_OPATOM(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 20:28:17 +02: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 05:44:21 +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 20:28:17 +02: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 08:55:46 +03: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 20:28:17 +02: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 06:53:41 +02:00
// operational pattern
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s))
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
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 08:55:46 +03:00
// essence container
simplify mxf_write_essence_container_refs Originally committed as revision 15075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:28:36 +03: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 06:36:25 +03: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 08:09:50 +02: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 04:13:23 +02: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 07:35:28 +02: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 21:11:45 +02: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 06:36:25 +03:00
mxf_write_primer_pack(s);
avformat/mxfenc: Correct KAG alignment of preface Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-30 02:26:37 +02:00
mxf_write_klv_fill(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 06:36:25 +03:00
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 21:11:45 +02: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 05:29:49 +02: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 04:13:23 +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 06:36:25 +03:00
// update header_byte_count
avio: avio_ prefix for url_fseek Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-28 15:57:54 +02: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 20:28:17 +02: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 15:57:54 +02: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 06:36:25 +03:00
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
if(key)
avformat: convert some avio_flush() calls to avio_write_marker(AVIO_DATA_MARKER_FLUSH_POINT) Converting explicit avio_flush() calls helps us to buffer more data and avoid flushing the IO context too often which causes reduced IO throughput for non-streamed file output. The user can control FLUSH_POINT flushing behaviour using the -flush_packets option, the default typically means to flush unless a non-streamed file output is used, so this change should have no adverse effect on streaming even if it is assumed that after an avio_flush() the output buffer is clean so small seekbacks within the output buffer will work even when the IO context is not seekable. Signed-off-by: Marton Balint <cus@passwd.hu>
2019-12-27 14:53:00 +02:00
avio_write_marker(pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT);
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 20:21:24 +03: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 08:55:46 +03:00
}
avformat/mxfenc: allow muxing prores
2018-12-05 19:10:37 +02:00
static const struct {
int profile;
UID codec_ul;
} mxf_prores_codec_uls[] = {
{ FF_PROFILE_PRORES_PROXY, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x01,0x00 } },
{ FF_PROFILE_PRORES_LT, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x02,0x00 } },
{ FF_PROFILE_PRORES_STANDARD, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x03,0x00 } },
{ FF_PROFILE_PRORES_HQ, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x04,0x00 } },
{ FF_PROFILE_PRORES_4444, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x05,0x00 } },
{ FF_PROFILE_PRORES_XQ, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x06,0x00 } },
};
static int mxf_parse_prores_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
int i, profile;
if (mxf->header_written)
return 1;
profile = st->codecpar->profile;
for (i = 0; i < FF_ARRAY_ELEMS(mxf_prores_codec_uls); i++) {
if (profile == mxf_prores_codec_uls[i].profile) {
sc->codec_ul = &mxf_prores_codec_uls[i].codec_ul;
break;
}
}
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
if (i == FF_ARRAY_ELEMS(mxf_prores_codec_uls))
avformat/mxfenc: allow muxing prores
2018-12-05 19:10:37 +02:00
return 0;
sc->frame_size = pkt->size;
return 1;
}
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
static const struct {
avformat/mxfenc: Store locally whether DNXHD profile is interlaced It is just a flag per supported CID. So there is no reason to use an avpriv function for this purpose. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-09 16:14:51 +02:00
uint16_t cid;
uint8_t interlaced;
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
UID codec_ul;
} mxf_dnxhd_codec_uls[] = {
avformat/mxfenc: Store locally whether DNXHD profile is interlaced It is just a flag per supported CID. So there is no reason to use an avpriv function for this purpose. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-09 16:14:51 +02:00
{ 1235, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 } }, // 1080p 10bit HIGH
{ 1237, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x03,0x00,0x00 } }, // 1080p 8bit MED
{ 1238, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x04,0x00,0x00 } }, // 1080p 8bit HIGH
{ 1241, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x07,0x00,0x00 } }, // 1080i 10bit HIGH
{ 1242, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x08,0x00,0x00 } }, // 1080i 8bit MED
{ 1243, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x09,0x00,0x00 } }, // 1080i 8bit HIGH
{ 1244, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x0a,0x00,0x00 } }, // 1080i 8bit TR
{ 1250, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x10,0x00,0x00 } }, // 720p 10bit
{ 1251, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x11,0x00,0x00 } }, // 720p 8bit HIGH
{ 1252, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x12,0x00,0x00 } }, // 720p 8bit MED
{ 1253, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x13,0x00,0x00 } }, // 720p 8bit LOW
{ 1256, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x16,0x00,0x00 } }, // 1080p 10bit 444
{ 1258, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x18,0x00,0x00 } }, // 720p 8bit TR
{ 1259, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x19,0x00,0x00 } }, // 1080p 8bit TR
{ 1260, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x1a,0x00,0x00 } }, // 1080i 8bit TR MBAFF
{ 1270, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x24,0x00,0x00 } }, // DNXHR 444
{ 1271, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x25,0x00,0x00 } }, // DNXHR HQX
{ 1272, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x26,0x00,0x00 } }, // DNXHR HQ
{ 1273, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x27,0x00,0x00 } }, // DNXHR SQ
{ 1274, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x28,0x00,0x00 } }, // DNXHR LB
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
};
static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt)
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03:00
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
avformat/mxfenc: Remove redundant DNXHD frame size checks The actual frame_size is no longer used since commit 3d38e45eb85c7a2420cb48a9cd45625c28644b2e; and the check for "< 0" is equivalent to the CID being valid. But this is already checked by avpriv_dnxhd_get_interlaced() (and is actually already ensured by mxf_dnxhd_codec_uls containing this CID). Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-09 15:51:14 +02:00
int i, cid;
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03:00
if (mxf->header_written)
return 1;
if (pkt->size < 43)
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
return 0;
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03:00
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
cid = AV_RB32(pkt->data + 0x28);
for (i = 0; i < FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls); i++) {
if (cid == mxf_dnxhd_codec_uls[i].cid) {
sc->codec_ul = &mxf_dnxhd_codec_uls[i].codec_ul;
avformat/mxfenc: Store locally whether DNXHD profile is interlaced It is just a flag per supported CID. So there is no reason to use an avpriv function for this purpose. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-09 16:14:51 +02:00
sc->interlaced = mxf_dnxhd_codec_uls[i].interlaced;
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
break;
}
}
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
if (i == FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls))
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
return 0;
sc->component_depth = 0;
switch (pkt->data[0x21] >> 5) {
case 1: sc->component_depth = 8; break;
case 2: sc->component_depth = 10; break;
case 3: sc->component_depth = 12; break;
}
if (!sc->component_depth)
return 0;
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03:00
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
if (cid >= 1270) { // RI raster
av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den,
st->codecpar->width, st->codecpar->height,
INT_MAX);
} else {
sc->aspect_ratio = (AVRational){ 16, 9 };
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03:00
}
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
sc->frame_size = pkt->size;
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03:00
return 1;
}
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
static const struct {
const UID container_ul;
const UID codec_ul;
} mxf_dv_uls[] = {
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x01,0x01 }, // IEC DV25 525/60
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x01,0x00 } },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x02,0x01 }, // IEC DV25 626/50
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 } },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x40,0x01 }, // DV25 525/60
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x01,0x00 }, },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, // DV25 625/50
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 }, },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x50,0x01 }, // DV50 525/60
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x03,0x00 }, },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x51,0x01 }, // DV50 625/50
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 }, },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x60,0x01 }, // DV100 1080/60
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x05,0x00 }, },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x61,0x01 }, // DV100 1080/50
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x06,0x00 }, },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x62,0x01 }, // DV100 720/60
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x07,0x00 }, },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x63,0x01 }, // DV100 720/50
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x08,0x00 }, },
};
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 19:09:47 +03:00
static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
av(format|device): Add const to muxer packet data pointers The packets given to muxers need not be writable, so it is best to access them via const uint8_t*. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-07-04 18:08:14 +02:00
const uint8_t *vs_pack, *vsc_pack;
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
int apt, ul_index, stype, pal;
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 19:09:47 +03:00
if (mxf->header_written)
return 1;
// Check for minimal frame size
if (pkt->size < 120000)
return -1;
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
apt = pkt->data[4] & 0x7;
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 19:09:47 +03:00
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;
avformat/mxfenc: cosmetic changes Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-09-14 16:05:31 +02:00
if ((vsc_pack[2] & 0x07) == 0x02) {
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 19:09:47 +03:00
sc->aspect_ratio = (AVRational){ 16, 9 };
avformat/mxfenc: cosmetic changes Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-09-14 16:05:31 +02:00
} else {
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 19:09:47 +03:00
sc->aspect_ratio = (AVRational){ 4, 3 };
avformat/mxfenc: cosmetic changes Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-09-14 16:05:31 +02:00
}
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 19:09:47 +03:00
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
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
ul_index = 8+pal;
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 19:09:47 +03:00
if (sc->interlaced) {
lavf: add missing new line to some error messages Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-01 13:35:14 +03: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 19:09:47 +03:00
sc->interlaced = 0;
}
break;
case 0x14: // DV100 1080i
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
ul_index = 6+pal;
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 19:09:47 +03:00
break;
case 0x04: // DV50
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
ul_index = 4+pal;
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 19:09:47 +03:00
break;
default: // DV25
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
if (!apt) { // IEC
ul_index = 0+pal;
} else {
ul_index = 2+pal;
avformat/mxfenc: Fix labels for IEC PAL DV 420
2017-09-12 22:17:12 +02:00
}
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 19:09:47 +03:00
}
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
sc->container_ul = &mxf_dv_uls[ul_index].container_ul;
sc->codec_ul = &mxf_dv_uls[ul_index].codec_ul;
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
sc->frame_size = pkt->size;
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 19:09:47 +03:00
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-29 00:38:22 +02:00
static const struct {
UID uid;
int frame_size;
avformat/mxfenc: Use smaller types to make struct smaller Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 21:20:18 +02:00
uint8_t 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-29 00:38:22 +02:00
uint8_t interlaced;
avformat/mxfenc: Use smaller types to make struct smaller Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 21:20:18 +02:00
int8_t intra_only; // 1 or 0 when there are separate UIDs for Long GOP and Intra, -1 when Intra/LGOP detection can be ignored
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-29 00:38:22 +02:00
} mxf_h264_codec_uls[] = {
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x11,0x01 }, 0, 66, 0, -1 }, // AVC Baseline
avformat/mxfenc: add h264 profiles Signed-off-by: Thomas Mundt <tmundt75@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-06 21:05:47 +02:00
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x20,0x01 }, 0, 77, 0, -1 }, // AVC Main
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x30,0x01 }, 0, 88, 0, -1 }, // AVC Extended
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x40,0x01 }, 0, 100, 0, -1 }, // AVC High
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x50,0x01 }, 0, 110, 0, 0 }, // AVC High 10
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x60,0x01 }, 0, 122, 0, 0 }, // AVC High 422
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x70,0x01 }, 0, 244, 0, 0 }, // AVC High 444
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x20,0x01 }, 0, 110, 0, 1 }, // AVC High 10 Intra
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x01 }, 232960, 110, 1, 1 }, // AVC High 10 Intra RP2027 Class 50 1080/59.94i
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x02 }, 281088, 110, 1, 1 }, // AVC High 10 Intra RP2027 Class 50 1080/50i
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x03 }, 232960, 110, 0, 1 }, // AVC High 10 Intra RP2027 Class 50 1080/29.97p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x04 }, 281088, 110, 0, 1 }, // AVC High 10 Intra RP2027 Class 50 1080/25p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x08 }, 116736, 110, 0, 1 }, // AVC High 10 Intra RP2027 Class 50 720/59.94p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x09 }, 140800, 110, 0, 1 }, // AVC High 10 Intra RP2027 Class 50 720/50p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x30,0x01 }, 0, 122, 0, 1 }, // AVC High 422 Intra
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x01 }, 472576, 122, 1, 1 }, // AVC High 422 Intra RP2027 Class 100 1080/59.94i
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x02 }, 568832, 122, 1, 1 }, // AVC High 422 Intra RP2027 Class 100 1080/50i
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x03 }, 472576, 122, 0, 1 }, // AVC High 422 Intra RP2027 Class 100 1080/29.97p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x04 }, 568832, 122, 0, 1 }, // AVC High 422 Intra RP2027 Class 100 1080/25p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x08 }, 236544, 122, 0, 1 }, // AVC High 422 Intra RP2027 Class 100 720/59.94p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x09 }, 284672, 122, 0, 1 }, // AVC High 422 Intra RP2027 Class 100 720/50p
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x01,0x32,0x40,0x01 }, 0, 244, 0, 1 }, // AVC High 444 Intra
avformat/mxfenc: add h264 profiles Signed-off-by: Thomas Mundt <tmundt75@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-06 21:05:47 +02:00
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x01,0x32,0x50,0x01 }, 0, 44, 0, -1 }, // AVC CAVLC 444
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-29 00:38:22 +02:00
};
static int mxf_parse_h264_frame(AVFormatContext *s, AVStream *st,
AVPacket *pkt, MXFIndexEntry *e)
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
avformat/avc, mxfenc: Avoid allocation of H264 SPS structure, fix memleak Up until now, ff_avc_decode_sps would parse a SPS and return some properties from it in a freshly allocated structure. Yet said structure is very small and completely internal to libavformat, so there is no reason to use the heap for it. This commit therefore changes the function to return an int and to modify a caller-provided structure. This will also allow ff_avc_decode_sps to return better error codes in the future. It also fixes a memleak in mxfenc: If a packet contained multiple SPS, only the SPS structure belonging to the last SPS would be freed, the other ones would leak when the pointer is overwritten to point to the new SPS structure. Of course, without allocations there are no leaks. This is Coverity issue #1445194. Furthermore, the SPS structure has been renamed from H264SequenceParameterSet to H264SPS in order to avoid overlong lines. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-06-24 17:51:58 +02:00
H264SPS seq, *const sps = &seq;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
GetBitContext gb;
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-29 00:38:22 +02:00
const uint8_t *buf = pkt->data;
const uint8_t *buf_end = pkt->data + pkt->size;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
const uint8_t *nal_end;
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
const UID *codec_ul = NULL;
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-29 00:38:22 +02:00
uint32_t state = -1;
int extra_size = 512; // support AVC Intra files without SPS/PPS header
avformat/avc, mxfenc: Avoid allocation of H264 SPS structure, fix memleak Up until now, ff_avc_decode_sps would parse a SPS and return some properties from it in a freshly allocated structure. Yet said structure is very small and completely internal to libavformat, so there is no reason to use the heap for it. This commit therefore changes the function to return an int and to modify a caller-provided structure. This will also allow ff_avc_decode_sps to return better error codes in the future. It also fixes a memleak in mxfenc: If a packet contained multiple SPS, only the SPS structure belonging to the last SPS would be freed, the other ones would leak when the pointer is overwritten to point to the new SPS structure. Of course, without allocations there are no leaks. This is Coverity issue #1445194. Furthermore, the SPS structure has been renamed from H264SequenceParameterSet to H264SPS in order to avoid overlong lines. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-06-24 17:51:58 +02:00
int i, frame_size, slice_type, has_sps = 0, intra_only = 0, ret;
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-29 00:38:22 +02:00
for (;;) {
buf = avpriv_find_start_code(buf, buf_end, &state);
if (buf >= buf_end)
break;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
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-29 00:38:22 +02:00
switch (state & 0x1f) {
Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c' * commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c': h264: add H264_ prefix to the NAL unit types Conflicts: libavcodec/h264_parse.c libavcodec/h264_parser.c libavcodec/h264_slice.c libavcodec/h264dec.c Merged-by: James Almer <jamrial@gmail.com>
2016-08-01 20:11:05 +02:00
case H264_NAL_SPS:
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-29 00:38:22 +02:00
e->flags |= 0x40;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
if (mxf->header_written)
break;
nal_end = ff_avc_find_startcode(buf, buf_end);
avformat/avc, mxfenc: Avoid allocation of H264 SPS structure, fix memleak Up until now, ff_avc_decode_sps would parse a SPS and return some properties from it in a freshly allocated structure. Yet said structure is very small and completely internal to libavformat, so there is no reason to use the heap for it. This commit therefore changes the function to return an int and to modify a caller-provided structure. This will also allow ff_avc_decode_sps to return better error codes in the future. It also fixes a memleak in mxfenc: If a packet contained multiple SPS, only the SPS structure belonging to the last SPS would be freed, the other ones would leak when the pointer is overwritten to point to the new SPS structure. Of course, without allocations there are no leaks. This is Coverity issue #1445194. Furthermore, the SPS structure has been renamed from H264SequenceParameterSet to H264SPS in order to avoid overlong lines. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-06-24 17:51:58 +02:00
ret = ff_avc_decode_sps(sps, buf, nal_end - buf);
if (ret < 0) {
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
av_log(s, AV_LOG_ERROR, "error parsing sps\n");
return 0;
}
avformat/avc, mxfenc: Avoid allocation of H264 SPS structure, fix memleak Up until now, ff_avc_decode_sps would parse a SPS and return some properties from it in a freshly allocated structure. Yet said structure is very small and completely internal to libavformat, so there is no reason to use the heap for it. This commit therefore changes the function to return an int and to modify a caller-provided structure. This will also allow ff_avc_decode_sps to return better error codes in the future. It also fixes a memleak in mxfenc: If a packet contained multiple SPS, only the SPS structure belonging to the last SPS would be freed, the other ones would leak when the pointer is overwritten to point to the new SPS structure. Of course, without allocations there are no leaks. This is Coverity issue #1445194. Furthermore, the SPS structure has been renamed from H264SequenceParameterSet to H264SPS in order to avoid overlong lines. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-06-24 17:51:58 +02:00
has_sps = 1;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
sc->aspect_ratio.num = st->codecpar->width * sps->sar.num;
sc->aspect_ratio.den = st->codecpar->height * sps->sar.den;
av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den,
sc->aspect_ratio.num, sc->aspect_ratio.den, 1024*1024);
intra_only = (sps->constraint_set_flags >> 3) & 1;
sc->interlaced = !sps->frame_mbs_only_flag;
sc->component_depth = sps->bit_depth_luma;
buf = nal_end;
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-29 00:38:22 +02:00
break;
Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c' * commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c': h264: add H264_ prefix to the NAL unit types Conflicts: libavcodec/h264_parse.c libavcodec/h264_parser.c libavcodec/h264_slice.c libavcodec/h264dec.c Merged-by: James Almer <jamrial@gmail.com>
2016-08-01 20:11:05 +02:00
case H264_NAL_PPS:
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-29 00:38:22 +02:00
if (e->flags & 0x40) { // sequence header present
e->flags |= 0x80; // random access
extra_size = 0;
}
break;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
case H264_NAL_IDR_SLICE:
e->flags |= 0x04; // IDR Picture
buf = buf_end;
break;
case H264_NAL_SLICE:
init_get_bits8(&gb, buf, buf_end - buf);
get_ue_golomb_long(&gb); // skip first_mb_in_slice
slice_type = get_ue_golomb_31(&gb);
switch (slice_type % 5) {
case 0:
e->flags |= 0x20; // P Picture
e->flags |= 0x06; // P Picture
break;
case 1:
e->flags |= 0x30; // B Picture
e->flags |= 0x03; // non-referenced B Picture
break;
}
buf = buf_end;
break;
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-29 00:38:22 +02:00
default:
break;
}
}
if (mxf->header_written)
return 1;
avformat/avc, mxfenc: Avoid allocation of H264 SPS structure, fix memleak Up until now, ff_avc_decode_sps would parse a SPS and return some properties from it in a freshly allocated structure. Yet said structure is very small and completely internal to libavformat, so there is no reason to use the heap for it. This commit therefore changes the function to return an int and to modify a caller-provided structure. This will also allow ff_avc_decode_sps to return better error codes in the future. It also fixes a memleak in mxfenc: If a packet contained multiple SPS, only the SPS structure belonging to the last SPS would be freed, the other ones would leak when the pointer is overwritten to point to the new SPS structure. Of course, without allocations there are no leaks. This is Coverity issue #1445194. Furthermore, the SPS structure has been renamed from H264SequenceParameterSet to H264SPS in order to avoid overlong lines. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-06-24 17:51:58 +02:00
if (!has_sps)
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +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-29 00:38:22 +02:00
frame_size = pkt->size + extra_size;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
for (i = 0; i < FF_ARRAY_ELEMS(mxf_h264_codec_uls); i++) {
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-29 00:38:22 +02:00
if (frame_size == mxf_h264_codec_uls[i].frame_size && sc->interlaced == mxf_h264_codec_uls[i].interlaced) {
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
codec_ul = &mxf_h264_codec_uls[i].uid;
avformat/mxfenc: add h264 profiles Signed-off-by: Thomas Mundt <tmundt75@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-06 21:05:47 +02:00
sc->component_depth = 10; // AVC Intra is always 10 Bit
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
sc->aspect_ratio = (AVRational){ 16, 9 }; // 16:9 is mandatory for broadcast HD
st->codecpar->profile = mxf_h264_codec_uls[i].profile;
sc->avc_intra = 1;
mxf->cbr_index = 1;
sc->frame_size = pkt->size;
avformat/mxfenc: add h264 profiles Signed-off-by: Thomas Mundt <tmundt75@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-06 21:05:47 +02:00
if (sc->interlaced)
sc->field_dominance = 1; // top field first is mandatory for AVC Intra
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
break;
avformat/avc, mxfenc: Avoid allocation of H264 SPS structure, fix memleak Up until now, ff_avc_decode_sps would parse a SPS and return some properties from it in a freshly allocated structure. Yet said structure is very small and completely internal to libavformat, so there is no reason to use the heap for it. This commit therefore changes the function to return an int and to modify a caller-provided structure. This will also allow ff_avc_decode_sps to return better error codes in the future. It also fixes a memleak in mxfenc: If a packet contained multiple SPS, only the SPS structure belonging to the last SPS would be freed, the other ones would leak when the pointer is overwritten to point to the new SPS structure. Of course, without allocations there are no leaks. This is Coverity issue #1445194. Furthermore, the SPS structure has been renamed from H264SequenceParameterSet to H264SPS in order to avoid overlong lines. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-06-24 17:51:58 +02:00
} else if (has_sps && mxf_h264_codec_uls[i].frame_size == 0 &&
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
mxf_h264_codec_uls[i].profile == sps->profile_idc &&
(mxf_h264_codec_uls[i].intra_only < 0 ||
mxf_h264_codec_uls[i].intra_only == intra_only)) {
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
codec_ul = &mxf_h264_codec_uls[i].uid;
avformat/mxfenc: support XAVC long gop
2018-10-18 22:37:05 +02:00
st->codecpar->profile = sps->profile_idc;
st->codecpar->level = sps->level_idc;
// continue to check for avc intra
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-29 00:38:22 +02:00
}
}
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
if (!codec_ul) {
avformat/mxfenc: add h264 profiles Signed-off-by: Thomas Mundt <tmundt75@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-06 21:05:47 +02:00
av_log(s, AV_LOG_ERROR, "h264 profile not supported\n");
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-29 00:38:22 +02:00
return 0;
}
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
sc->codec_ul = codec_ul;
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-29 00:38:22 +02:00
return 1;
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
static inline int get_ffv1_unsigned_symbol(RangeCoder *c, uint8_t *state) {
if(get_rac(c, state+0))
return 0;
else{
int i, e;
unsigned a;
e= 0;
while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
e++;
if (e > 31)
return AVERROR_INVALIDDATA;
}
a= 1;
for(i=e-1; i>=0; i--){
a += a + get_rac(c, state+22 + FFMIN(i,9)); //22..31
}
return a;
}
}
#define FFV1_CONTEXT_SIZE 32
static int mxf_parse_ffv1_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
uint8_t state[FFV1_CONTEXT_SIZE];
RangeCoder c;
unsigned v;
sc->frame_size = pkt->size;
if (mxf->header_written)
return 1;
memset(state, 128, sizeof(state));
if (st->codecpar->extradata) {
ff_init_range_decoder(&c, st->codecpar->extradata, st->codecpar->extradata_size);
ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8);
v = get_ffv1_unsigned_symbol(&c, state);
av_assert0(v >= 2);
if (v > 4) {
return 0;
}
avformat/mxfenc: reject unsupported ffv1 versions Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2023-04-04 16:57:03 +02:00
if (v > 4) {
av_log(s, AV_LOG_ERROR, "unsupported ffv1 version %d\n", v);
return 0;
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
sc->micro_version = get_ffv1_unsigned_symbol(&c, state);
} else {
uint8_t keystate = 128;
ff_init_range_decoder(&c, pkt->data, pkt->size);
ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8);
get_rac(&c, &keystate); // keyframe
v = get_ffv1_unsigned_symbol(&c, state);
av_assert0(v < 2);
}
sc->codec_ul = &mxf_ffv1_codec_uls[v];
if (st->codecpar->field_order > AV_FIELD_PROGRESSIVE) {
sc->interlaced = 1;
sc->field_dominance = st->codecpar->field_order == (st->codecpar->field_order == AV_FIELD_TT || st->codecpar->field_order == AV_FIELD_TB) ? 1 : 2;
}
sc->aspect_ratio.num = st->codecpar->width * st->codecpar->sample_aspect_ratio.num;
sc->aspect_ratio.den = st->codecpar->height * st->codecpar->sample_aspect_ratio.den;
av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den,
sc->aspect_ratio.num, sc->aspect_ratio.den, INT_MAX);
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 05:41:31 +03: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 19:16:30 +03: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 05:41:31 +03: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 21:42:52 +03: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 05:41:31 +03: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 11:41:02 +02: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 11:02:01 +03: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 21:42:52 +03: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 11:02:01 +03: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 21:42:52 +03: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 11:02:01 +03: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 21:42:52 +03: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 19:16:30 +03: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 21:42:52 +03: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 11:02:01 +03: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 21:42:52 +03: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 11:02:01 +03: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 05:41:31 +03: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 11:35:47 +03: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 08:32:12 +02: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 10:43:32 +03:00
if (c == 0x1b5) {
remove unneeded length checks Originally committed as revision 18834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 07:43:44 +03: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 21:42:52 +03:00
st->codecpar->profile = pkt->data[i+1] & 0x07;
st->codecpar->level = pkt->data[i+2] >> 4;
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
sc->low_delay = pkt->data[i+6] >> 7;
parse mpeg2 progressive frame flag Originally committed as revision 16889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:42:47 +02: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 15:21:41 +03: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 08:32:12 +02: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 12:03:38 +02: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 10:41:40 +03:00
if (pkt->data[i+4]>>6 & 0x01) { // closed
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
if (sc->seq_closed_gop == -1)
sc->seq_closed_gop = 1;
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 10:41:40 +03:00
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 11:35:47 +03:00
if (e->flags & 0x40) // sequence header present
e->flags |= 0x80; // random access
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
} else {
sc->seq_closed_gop = 0;
sc->closed_gop = 0;
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 10:41:40 +03: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 12:03:38 +02: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 11:35:47 +03:00
e->flags |= 0x40;
reindent Originally committed as revision 18835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 07:44:37 +03: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 21:42:52 +03: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 07:44:37 +03: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 12:03:38 +02: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 11:35:47 +03: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 11:35:47 +03: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 10:41:40 +03: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 11:35:47 +03: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 10:41:40 +03: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 11:35:47 +03: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 12:03:38 +02: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 08:32:12 +02:00
}
}
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (!IS_D10(s)) {
avformat/mxfenc: Never set codec_ul UID to NULL mxf distinguishes codec profiles by different UIDs and therefore needs to check that the input is actually compatible with mxf (i.e. if there is a defined UID for it). If not, then sometimes the UID would be set to NULL and writing the (video) packet would fail. Yet the following audio packet would trigger writing the header (which has been postponed because the UID is not known at the start) and if the UID is NULL, this can lead to segfaults. This commit therefore stops setting the UID to NULL if the input is incompatible with mxf (it has initially been set to a generic value in mxf_write_header()). Fixes #7993. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-02-28 05:48:22 +02:00
const UID *codec_ul = mxf_get_mpeg2_codec_ul(st->codecpar);
if (!codec_ul)
return 0;
sc->codec_ul = codec_ul;
}
return 1;
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:32:12 +02:00
}
avformat/mxfenc: support writing subsecond precision timestamps Signed-off-by: Marton Balint <cus@passwd.hu>
2018-12-22 21:02:09 +02:00
static uint64_t mxf_parse_timestamp(int64_t timestamp64)
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 22:15:18 +02:00
{
avformat/mxfenc: support writing subsecond precision timestamps Signed-off-by: Marton Balint <cus@passwd.hu>
2018-12-22 21:02:09 +02:00
time_t timestamp = timestamp64 / 1000000;
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 10:46:36 +03: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-15 00:36:23 +02: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 22:15:18 +02: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 |
avformat/mxfenc: support writing subsecond precision timestamps Signed-off-by: Marton Balint <cus@passwd.hu>
2018-12-22 21:02:09 +02:00
time->tm_sec << 8 |
(timestamp64 % 1000000) / 4000;
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 22:15:18 +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 08:15:00 +02: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 11:53:40 +03: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 08:15:00 +02: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 15:33:40 +03: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 08:15:00 +02:00
}
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
static int mxf_init_timecode(AVFormatContext *s, AVStream *st, AVRational tbc)
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
{
MXFContext *mxf = s->priv_data;
AVDictionaryEntry *tcr = av_dict_get(s->metadata, "timecode", NULL, 0);
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
if (!ff_mxf_get_content_package_rate(tbc)) {
avformat/mxfenc: allow all frame rates if -strict mode is set to unofficial or lower There was no consensus wheter or not to allow unofficial frame rates due to possible interoperability issues, a compromise is to only allow it if -strict mode is set to unofficial. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-05 22:36:20 +02:00
if (s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
av_log(s, AV_LOG_ERROR, "Unsupported frame rate %d/%d. Set -strict option to 'unofficial' or lower in order to allow it!\n", tbc.den, tbc.num);
return AVERROR(EINVAL);
} else {
av_log(s, AV_LOG_WARNING, "Unofficial frame rate %d/%d.\n", tbc.den, tbc.num);
}
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
}
mxf->timecode_base = (tbc.den + tbc.num/2) / tbc.num;
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 (!tcr)
tcr = av_dict_get(st->metadata, "timecode", NULL, 0);
if (tcr)
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
return av_timecode_init_from_string(&mxf->tc, av_inv_q(tbc), tcr->value, s);
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
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
return av_timecode_init(&mxf->tc, av_inv_q(tbc), 0, 0, s);
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
}
avformat/mux: Move ff_choose_chroma_location to mxfenc, its only user Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-05-06 14:49:16 +02:00
static enum AVChromaLocation choose_chroma_location(AVFormatContext *s, AVStream *st)
{
AVCodecParameters *par = st->codecpar;
const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(par->format);
if (par->chroma_location != AVCHROMA_LOC_UNSPECIFIED)
return par->chroma_location;
if (pix_desc) {
if (pix_desc->log2_chroma_h == 0) {
return AVCHROMA_LOC_TOPLEFT;
} else if (pix_desc->log2_chroma_w == 1 && pix_desc->log2_chroma_h == 1) {
if (par->field_order == AV_FIELD_UNKNOWN || par->field_order == AV_FIELD_PROGRESSIVE) {
switch (par->codec_id) {
case AV_CODEC_ID_MJPEG:
case AV_CODEC_ID_MPEG1VIDEO: return AVCHROMA_LOC_CENTER;
}
}
if (par->field_order == AV_FIELD_UNKNOWN || par->field_order != AV_FIELD_PROGRESSIVE) {
switch (par->codec_id) {
case AV_CODEC_ID_MPEG2VIDEO: return AVCHROMA_LOC_LEFT;
}
}
}
}
return AVCHROMA_LOC_UNSPECIFIED;
}
avformat/mxfenc: Make init function out of write_header The MXF muxers only write the header after they have received a packet; the actual write_header function does not write anything. So make an init function out of it. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 21:58:27 +02:00
static int mxf_init(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 15:36:17 +03:00
{
MXFContext *mxf = s->priv_data;
mxfenc: use new public timecode API.
2012-01-16 16:19:37 +03:00
int i, ret;
uses FF_ARRAY_ELEMS() where appropriate Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-22 00:40:24 +03:00
uint8_t present[FF_ARRAY_ELEMS(mxf_essence_container_uls)] = {0};
lavf: deprecate AVFormatContext.timestamp It's replaced by 'creation_time' metadata tag.
2011-07-07 12:25:03 +03: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 02:47:58 +03:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s) && s->nb_streams != 1) {
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
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 15:24:26 +02: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 02:47:58 +03: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 03:39:34 +03: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 02:47:58 +03:00
if (!sc)
return AVERROR(ENOMEM);
st->priv_data = sc;
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
sc->index = -1;
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +02:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (((i == 0) ^ (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) && !IS_OPATOM(s)) {
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 12:48:45 +03: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 21:42:52 +03: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 13:12:59 +03:00
// TODO: should be avg_frame_rate
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
AVRational tbc = st->time_base;
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03: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 mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
sc->v_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
avformat/mxfenc: calculate and store DAR from user SAR
2018-12-10 11:15:27 +02:00
if (st->codecpar->sample_aspect_ratio.num && st->codecpar->sample_aspect_ratio.den) {
sc->aspect_ratio = av_mul_q(st->codecpar->sample_aspect_ratio,
av_make_q(st->codecpar->width, st->codecpar->height));
}
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: Add vertical subsampling support Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-21 20:32:32 +02:00
sc->v_chroma_sub_sample = 1 << pix_desc->log2_chroma_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
}
avformat/mux: Move ff_choose_chroma_location to mxfenc, its only user Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-05-06 14:49:16 +02:00
switch (choose_chroma_location(s, st)) {
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
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
avformat/mxf: get rid of samples per frame array usage Signed-off-by: Marton Balint <cus@passwd.hu>
2020-02-28 02:10:45 +02:00
mxf->content_package_rate = ff_mxf_get_content_package_rate(tbc);
mxf->time_base = tbc;
lavf: make av_set_pts_info private. It's supposed to be called only from (de)muxers.
2011-11-29 21:28:15 +03:00
avpriv_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den);
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
if((ret = mxf_init_timecode(s, st, tbc)) < 0)
mxfenc: use new public timecode API.
2012-01-16 16:19:37 +03: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
avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser
2018-03-21 18:35:22 +02:00
if (st->codecpar->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
sc->seq_closed_gop = -1; // unknown yet
}
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;
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s) ||
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
st->codecpar->codec_id == AV_CODEC_ID_DNXHD ||
st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO)
mxf->cbr_index = 1;
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s)) {
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
int ntsc = mxf->time_base.den != 25;
int ul_index;
avformat/mxfenc: Check that the video codec in D-10 is MPEG-2 Others do not work, but nothing rejects them prior to this patch if the parameters otherwise match Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-29 02:13:20 +02:00
if (st->codecpar->codec_id != AV_CODEC_ID_MPEG2VIDEO) {
av_log(s, AV_LOG_ERROR, "error MXF D-10 only support MPEG-2 Video\n");
return AVERROR(EINVAL);
}
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)) {
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
ul_index = 0;
} else if ((sc->video_bit_rate == 49999840 || sc->video_bit_rate == 50000000) && ntsc) {
ul_index = 1;
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 11:02:12 +03:00
} else if (sc->video_bit_rate == 40000000) {
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
ul_index = 2+ntsc;
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 11:02:12 +03:00
} else if (sc->video_bit_rate == 30000000) {
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
ul_index = 4+ntsc;
libavformat/mxfenc: add {} to complex ifs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21 18:36:53 +03:00
} else {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
av_log(s, AV_LOG_ERROR, "error MXF D-10 only support 30/40/50 mbit/s\n");
return -1;
}
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
sc->codec_ul = &mxf_d10_codec_uls[ul_index];
sc->container_ul = &mxf_d10_container_uls[ul_index];
sc->index = INDEX_D10_VIDEO;
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;
avformat/mxfenc: Set color siting to 0 for D10-MXF SMPTE 386M (D-10) lists 4 as value to be used SMPTE 377-1-2009 says "The definitions of 00h (coSiting) and 04h (Rec 601) are equivalent. The value of 04h is deprecated. New MXF encoders shall use the value of 00h instead." Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-06 18:09:54 +02:00
sc->color_siting = 0;
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
sc->frame_size = (int64_t)sc->video_bit_rate *
mxf->time_base.num / (8*mxf->time_base.den);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 21:42:52 +03:00
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
avformat/audiointerleave: only keep the retime functionality of the audio interleaver And rename it to retimeinterleave, use the pcm_rechunk bitstream filter for rechunking. By seperating the two functions we hopefully get cleaner code. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-26 00:49:17 +02:00
char bsf_arg[32];
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 21:42:52 +03:00
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 08:18:25 +02: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 21:42:52 +03:00
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s)) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 21:42:52 +03: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 09:28:20 +02:00
av_log(s, AV_LOG_ERROR, "MXF D-10 only support 16 or 24 bits le audio\n");
}
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
sc->index = INDEX_D10_AUDIO;
sc->container_ul = ((MXFStreamContext*)s->streams[0]->priv_data)->container_ul;
avformat/mxf: get rid of samples per frame array usage Signed-off-by: Marton Balint <cus@passwd.hu>
2020-02-28 02:10:45 +02:00
sc->frame_size = 4 + 8 * av_rescale_rnd(st->codecpar->sample_rate, mxf->time_base.num, mxf->time_base.den, AV_ROUND_UP) * 4;
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
} else if (IS_OPATOM(s)) {
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 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;
}
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
if (st->codecpar->ch_layout.nb_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);
}
mxf->time_base = st->time_base;
avformat/mxfenc: factorize timecode checking and setting Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-04 00:13:07 +02:00
if((ret = mxf_init_timecode(s, st, tbc)) < 0)
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
return ret;
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
mxf->edit_unit_byte_count = (av_get_bits_per_sample(st->codecpar->codec_id) * st->codecpar->ch_layout.nb_channels) >> 3;
avformat/mxfenc: Replace literal numbers by named enum values. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-29 02:13:21 +02:00
sc->index = INDEX_WAV;
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 {
mxf->slice_count = 1;
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
sc->frame_size = st->codecpar->ch_layout.nb_channels *
avformat/mxf: get rid of samples per frame array usage Signed-off-by: Marton Balint <cus@passwd.hu>
2020-02-28 02:10:45 +02:00
av_rescale_rnd(st->codecpar->sample_rate, mxf->time_base.num, mxf->time_base.den, AV_ROUND_UP) *
av_get_bits_per_sample(st->codecpar->codec_id) / 8;
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
}
avformat/audiointerleave: only keep the retime functionality of the audio interleaver And rename it to retimeinterleave, use the pcm_rechunk bitstream filter for rechunking. By seperating the two functions we hopefully get cleaner code. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-26 00:49:17 +02:00
snprintf(bsf_arg, sizeof(bsf_arg), "r=%d/%d", mxf->tc.rate.num, mxf->tc.rate.den);
ret = ff_stream_add_bitstream_filter(st, "pcm_rechunk", bsf_arg);
if (ret < 0)
return ret;
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) {
AVDictionaryEntry *e = av_dict_get(st->metadata, "data_type", NULL, 0);
if (e && !strcmp(e->value, "vbi_vanc_smpte_436M")) {
avformat/mxfenc: simplify dnxhd handling and add more flavors
2018-10-16 22:19:45 +02:00
sc->index = INDEX_S436M;
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
} else {
av_log(s, AV_LOG_ERROR, "track %d: unsupported data type\n", i);
return -1;
}
if (st->index != s->nb_streams - 1) {
av_log(s, AV_LOG_ERROR, "data track must be placed last\n");
return -1;
}
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +02:00
}
set duration to distinguished value Originally committed as revision 15095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:46:50 +03:00
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
if (sc->index == -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 21:42:52 +03: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 09:34:01 +02: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 09:28:20 +02: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 05:41:31 +03:00
avformat/mxfenc: simplify d-10 ul handling
2019-06-21 01:11:28 +02:00
if (!sc->codec_ul)
sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
if (!sc->container_ul)
sc->container_ul = &mxf_essence_container_uls[sc->index].container_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 05:41:31 +03:00
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:13:44 +03: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];
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s) && st->codecpar->codec_id == AV_CODEC_ID_DNXHD) {
avformat/mxfenc: fix DNxHD GC element_type The values for the essence element type were updated in the spec from 0x05/0x06 (ST2019-4 2008) to 0x0C/0x0D (ST2019-4 2009). Fixes ticket #6380. Thanks-to: Philip de Nier <philip.denier@bbc.co.uk> Thanks-to: Matthieu Bouron <matthieu.bouron@gmail.com> Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> Signed-off-by: Marton Balint <cus@passwd.hu>
2021-12-14 17:27:43 +02:00
// clip-wrapping requires 0x0D per ST2019-4:2009 or 0x06 per previous version ST2019-4:2008
// we choose to use 0x06 instead 0x0D to be compatible with AVID systems
// and produce mxf files with the most relevant flavour for opatom
sc->track_essence_element_key[14] = 0x06;
}
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 04:33:28 +03: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 04:57:41 +02: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 02:47:58 +03: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 07:12:52 +03:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s) || IS_OPATOM(s)) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 11:43:10 +03: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 08:15:00 +02: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 08:18:25 +02: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];
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
if (!memcmp(sc->track_essence_element_key, mxf_essence_container_uls[INDEX_DV].element_ul, 13)) // DV
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 19:09:47 +03:00
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 08:18:25 +02:00
}
avformat/mxfenc: support writing subsecond precision timestamps Signed-off-by: Marton Balint <cus@passwd.hu>
2018-12-22 21:02:09 +02:00
if (ff_parse_creation_time_metadata(s, &timestamp, 0) > 0)
lavf: deprecate AVFormatContext.timestamp It's replaced by 'creation_time' metadata tag.
2011-07-07 12:25:03 +03: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 09:18:00 +02:00
mxf->duration = -1;
mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track));
if (!mxf->timecode_track)
return AVERROR(ENOMEM);
avformat/mxfenc: Avoid allocation for timecode track Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 23:11:22 +02:00
mxf->timecode_track->priv_data = &mxf->timecode_track_priv;
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 03:35:36 +02: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 22:15:18 +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 07:12:52 +03:00
return 0;
}
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:34:56 +02: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 12:04:12 +02:00
AVIOContext *pb = s->pb;
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02:00
unsigned frame;
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:34:56 +02:00
uint32_t time_code;
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
int i, system_item_bitmap = 0x58; // UL, user date/time stamp, picture present
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:34:56 +02:00
mxfenc: use new public timecode API.
2012-01-16 16:19:37 +03: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 04:34:56 +02: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 20:28:17 +02: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 09:06:35 +02:00
klv_encode_ber4_length(pb, 57);
lavf/mxfenc: support creating s436m data tracks
2016-11-19 21:09:24 +02:00
for (i = 0; i < s->nb_streams; i++) {
if (s->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
system_item_bitmap |= 0x4;
else if (s->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_DATA)
system_item_bitmap |= 0x2;
}
avio_w8(pb, system_item_bitmap);
avformat/mxfenc: correctly set content package rate in system element
2018-03-21 22:13:51 +02:00
avio_w8(pb, mxf->content_package_rate); // content package 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 20:28:17 +02:00
avio_w8(pb, 0x00); // content package type
avio_wb16(pb, 0x00); // channel handle
avformat/mxfenc: use a zero based continuity counter The standard does not seem to require the counter to be zero based, but some checker tools (MyriadBits MXFInspect, Interra Baton) have validations against 0 start... Fixes ticket #6781. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-02-29 02:25:56 +02:00
avio_wb16(pb, 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 04:34:56 +02: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 20:28:17 +02:00
avio_write(pb, multiple_desc_ul, 16);
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:46:03 +02:00
else {
MXFStreamContext *sc = s->streams[0]->priv_data;
avformat/mxfenc: simplify dv ul handling
2019-06-21 00:40:31 +02:00
avio_write(pb, *sc->container_ul, 16);
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:46:03 +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 20:28:17 +02: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 04:34:56 +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 20:28:17 +02:00
avio_w8(pb, 0x81); // SMPTE 12M time code
mxfenc: use new public timecode API.
2012-01-16 16:19:37 +03: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 20:28:17 +02: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 04:34:56 +02: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 20:28:17 +02: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 09:06:35 +02: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 20:28:17 +02: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 08:15:00 +02:00
mxf_write_umid(s, 1);
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:34:56 +02:00
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 12:04:12 +02: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 21:42:52 +03:00
int frame_size = pkt->size / st->codecpar->block_align;
avformat/(mpeg|mpegts|mxf|sup)enc: Use const uint8_t* to access pkt data The packets muxers receive are not guaranteed to be writable, so they must not be modified. Ergo only access the packet's data via a const uint8_t*. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-07-04 11:24:44 +02:00
const uint8_t *samples = pkt->data;
const uint8_t *const end = pkt->data + pkt->size;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
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 20:28:17 +02:00
avio_w8(pb, (frame_size == 1920 ? 0 : (mxf->edit_units_count-1) % 5 + 1));
avio_wl16(pb, frame_size);
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
avio_w8(pb, (1 << st->codecpar->ch_layout.nb_channels)-1);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
while (samples < end) {
mxf: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 17:49:17 +02:00
for (i = 0; i < st->codecpar->ch_layout.nb_channels; i++) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 21:42:52 +03: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 10:05:43 +02: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 09:28:20 +02: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 10:05:43 +02: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 09:28:20 +02: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 20:28:17 +02: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 09:28:20 +02: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 20:28:17 +02:00
avio_wl32(pb, i);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
}
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02: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;
return 0;
}
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
static void mxf_compute_edit_unit_byte_count(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
int i;
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s)) {
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
MXFStreamContext *sc = s->streams[0]->priv_data;
mxf->edit_unit_byte_count = sc->frame_size;
return;
}
mxf->edit_unit_byte_count = KAG_SIZE; // system element
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
MXFStreamContext *sc = st->priv_data;
sc->slice_offset = mxf->edit_unit_byte_count;
mxf->edit_unit_byte_count += 16 + 4 + sc->frame_size;
mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count);
}
}
cosmetics, mux_write -> mxf_write Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:50:25 +03: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 23:28:12 +03:00
{
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:32:12 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02: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 23:28:12 +03: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 11:35:47 +03: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 20:21:24 +03: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 23:28:12 +03:00
avformat/mxfenc: Discard audio until valid video has been received Normally, video packets are muxed before audio packets for mxf (there is a dedicated interleave function for this); furthermore the first (video) packet triggers writing the actual header. Yet when the first video packet fails the checks performed on it, it will be an audio packet that leads to writing the header and codec_ul (a value set based upon properties of the bitstream which necessitates actually inspecting packets) may be wrong. Therefore this commit discards audio packets until a valid video packet has been received. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-12-05 01:39:28 +02:00
if (!mxf->header_written && pkt->stream_index != 0 &&
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
!IS_OPATOM(s)) {
avformat/mxfenc: Discard audio until valid video has been received Normally, video packets are muxed before audio packets for mxf (there is a dedicated interleave function for this); furthermore the first (video) packet triggers writing the actual header. Yet when the first video packet fails the checks performed on it, it will be an audio packet that leads to writing the header and codec_ul (a value set based upon properties of the bitstream which necessitates actually inspecting packets) may be wrong. Therefore this commit discards audio packets until a valid video packet has been received. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-12-05 01:39:28 +02:00
av_log(s, AV_LOG_ERROR, "Received non-video packet before "
"header has been written\n");
return AVERROR_INVALIDDATA;
}
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
if (!mxf->cbr_index && !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 20:21:24 +03: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 12:03:38 +02: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 20:21:24 +03: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 12:03:38 +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 21:42:52 +03: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 11:35:47 +03: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 12:03:38 +02: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 08:32:12 +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
} else if (st->codecpar->codec_id == AV_CODEC_ID_DNXHD) {
mxfenc: support dnxhd codec
2012-05-29 01:45:41 +03:00
if (!mxf_parse_dnxhd_frame(s, st, pkt)) {
av_log(s, AV_LOG_ERROR, "could not get dnxhd profile\n");
return -1;
}
avformat/mxfenc: allow muxing prores
2018-12-05 19:10:37 +02:00
} else if (st->codecpar->codec_id == AV_CODEC_ID_PRORES) {
if (!mxf_parse_prores_frame(s, st, pkt)) {
av_log(s, AV_LOG_ERROR, "could not get prores 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 19:09:47 +03: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-29 00:38:22 +02:00
if (!mxf_parse_h264_frame(s, st, pkt, &ie)) {
av_log(s, AV_LOG_ERROR, "could not get h264 profile\n");
return -1;
}
avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 support
2023-03-14 10:49:16 +02:00
} else if (st->codecpar->codec_id == AV_CODEC_ID_FFV1) {
if (!mxf_parse_ffv1_frame(s, st, pkt)) {
av_log(s, AV_LOG_ERROR, "could not get ffv1 version\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 12:03:38 +02:00
}
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
if (mxf->cbr_index) {
if (pkt->size != sc->frame_size && st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
av_log(s, AV_LOG_ERROR, "track %d: frame size does not match index unit size, %d != %d\n",
st->index, pkt->size, sc->frame_size);
return -1;
}
if (!mxf->header_written)
mxf_compute_edit_unit_byte_count(s);
}
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s))
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
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 12:03:38 +02: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 12:44:38 +02: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 20:21:24 +03: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 12:44:38 +02: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 20:21:24 +03: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 12:44:38 +02:00
}
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:32:12 +02: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 04:38:07 +02: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 12:44:38 +02: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 11:02:29 +02: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 20:21:24 +03: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 11:02:29 +02: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 04:34:56 +02: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 09:23:51 +02:00
mxf_write_system_item(s);
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:34:56 +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 12:44:38 +02: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 11:35:47 +03: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 12:44:38 +02: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 12:03:38 +02: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 12:44:38 +02: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 17:13:22 +02: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-14 00:38:05 +02: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 12:03:38 +02: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 09:23:51 +02: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 20:28:17 +02:00
avio_write(pb, sc->track_essence_element_key, 16); // write key
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_D10(s) && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
avformat/mxfenc: write index delta entry array needed by sony vegas pro 11
2018-03-21 21:53:56 +02:00
mxf_write_d10_audio_packet(s, st, pkt);
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 12:44:38 +02:00
} 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 20:28:17 +02: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 12:44:38 +02: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 23:28:12 +03: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 12:03:38 +02: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 12:04:12 +02: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 21:11:45 +02: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 11:02:29 +02: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 12:03:38 +02:00
avformat/mxf: Deduplicate random_index_pack_key Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2021-01-03 03:21:51 +02:00
avio_write(pb, ff_mxf_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 18:06:49 +03: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 12:03:38 +02:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (mxf->edit_unit_byte_count && !IS_OPATOM(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 20:28:17 +02: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 03:05:06 +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 20:28:17 +02: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 12:03:38 +02:00
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 11:02:29 +02: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 20:28:17 +02: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 11:02:29 +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 20:28:17 +02: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 12:03:38 +02:00
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 21:11:45 +02: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 12:03:38 +02:00
}
cosmetics, mux_write -> mxf_write Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:50:25 +03: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 07:12:52 +03: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 06:36:25 +03:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 12:04:12 +02:00
AVIOContext *pb = s->pb;
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
int i, err;
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 04:13:23 +02: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 22:57:58 +02:00
if (!mxf->header_written ||
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
(IS_OPATOM(s) && !mxf->body_partition_offset)) {
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 22:57:58 +02:00
/* reason could be invalid options/not supported codec/out of memory */
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
return AVERROR_UNKNOWN;
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 22:57:58 +02:00
}
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 09:18:00 +02: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 04:13:23 +02: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 21:11:45 +02:00
mxf->footer_partition_offset = avio_tell(pb);
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (mxf->edit_unit_byte_count && !IS_OPATOM(s)) { // 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 20:21:24 +03:00
if ((err = mxf_write_partition(s, 0, 0, footer_partition_key, 0)) < 0)
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
return err;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
} else {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 20:21:24 +03:00
if ((err = mxf_write_partition(s, 0, 2, footer_partition_key, 0)) < 0)
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
return err;
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:34:01 +02: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 09:28:20 +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 12:03:38 +02: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 07:35:28 +02: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 12:03:38 +02:00
mxf_write_random_index_pack(s);
lavf: fix usage of AVIOContext.seekable It is supposed to be a flag. The only currently defined value is AVIO_SEEKABLE_NORMAL, but other ones may be added in the future. However all the current lavf code treats this field as a bool (mainly for historical reasons). Change all those cases to properly check for AVIO_SEEKABLE_NORMAL.
2016-09-27 16:26:37 +02:00
if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) {
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (IS_OPATOM(s)) {
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
/* 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)
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
return err;
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
}
avio: avio_ prefix for url_fseek Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-28 15:57:54 +02:00
avio_seek(pb, 0, SEEK_SET);
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
if (mxf->edit_unit_byte_count && !IS_OPATOM(s)) {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 20:21:24 +03:00
if ((err = mxf_write_partition(s, 1, 2, header_closed_partition_key, 1)) < 0)
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
return err;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02: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 12:44:38 +02:00
} else {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 20:21:24 +03:00
if ((err = mxf_write_partition(s, 0, 0, header_closed_partition_key, 1)) < 0)
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
return err;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
}
avformat/mxfenc: update body partition with footer offset
2018-03-21 21:59:11 +02:00
// update footer partition offset
for (i = 0; i < mxf->body_partitions_count; i++) {
avio_seek(pb, mxf->body_partition_offset[i]+44, SEEK_SET);
avio_wb64(pb, mxf->footer_partition_offset);
}
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 06:36:25 +03:00
}
free audio fifo Originally committed as revision 16905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 13:17:04 +02:00
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
return 0;
}
static void mxf_deinit(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
free index entries Originally committed as revision 17040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 06:35:36 +02:00
av_freep(&mxf->index_entries);
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 11:02:29 +02:00
av_freep(&mxf->body_partition_offset);
avformat/mxfenc: Avoid allocation for timecode track Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 23:11:22 +02:00
av_freep(&mxf->timecode_track);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 15:36:17 +03: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 07:12:52 +03:00
avformat/mux: Don't use stack packet when writing interleaved packets Currently the interleave_packet functions use a packet for a new packet to be interleaved (may be NULL if there is none) and a packet for output; said packet is always a stack packet in interleaved_write_packet(). But all the interleave_packet functions in use first move the packet to the packet list and then check whether a packet can be returned, i.e. the effective lifetime of the new packet ends before the packet for output is touched. So one can use one packet both for input and output by adding a new parameter that indicates whether there is a packet to add to the packet list; there is just one complication: In case the muxer is flushed, there is no packet available. This can be solved by reusing one of the packets from AVFormatInternal. They are currently unused when flushing in av_interleaved_write_frame(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-09-05 17:33:37 +02:00
static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, 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 08:18:25 +02:00
{
avformat: Avoid allocation for AVFormatInternal Do this by allocating AVFormatContext together with the data that is currently in AVFormatInternal; or rather: Put AVFormatContext at the beginning of a new structure called FFFormatContext (which encompasses more than just the internal fields and is a proper context in its own right, hence the name) and remove AVFormatInternal altogether. The biggest simplifications occured in avformat_alloc_context(), where one can now simply call avformat_free_context() in case of errors. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-08-24 14:58:07 +02:00
FFFormatContext *const si = ffformatcontext(s);
Remove MAX_STREAMS usage in ogg and mxf muxers Originally committed as revision 21526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-29 08:38:00 +02:00
int i, stream_count = 0;
for (i = 0; i < s->nb_streams; i++)
avformat: Avoid allocation for AVStreamInternal Do this by allocating AVStream together with the data that is currently in AVStreamInternal; or rather: Put AVStream at the beginning of a new structure called FFStream (which encompasses more than just the internal fields and is a proper context in its own right, hence the name) and remove AVStreamInternal altogether. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-08-24 19:41:16 +02:00
stream_count += !!ffstream(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 08:18:25 +02:00
if (stream_count && (s->nb_streams == stream_count || flush)) {
avcodec/packet_internal: Add proper PacketList struct Up until now, we had a PacketList structure which is actually a PacketListEntry; a proper PacketList did not exist and all the related functions just passed pointers to pointers to the head and tail elements around. All these pointers were actually consecutive elements of their containing structs, i.e. the users already treated them as if they were a struct. So add a proper PacketList struct and rename the current PacketList to PacketListEntry; also make the functions use this structure instead of the pair of pointers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-12-16 02:49:39 +02:00
PacketListEntry *pktl = si->packet_buffer.head;
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 12:04:36 +02:00
if (s->nb_streams != stream_count) {
avcodec/packet_internal: Add proper PacketList struct Up until now, we had a PacketList structure which is actually a PacketListEntry; a proper PacketList did not exist and all the related functions just passed pointers to pointers to the head and tail elements around. All these pointers were actually consecutive elements of their containing structs, i.e. the users already treated them as if they were a struct. So add a proper PacketList struct and rename the current PacketList to PacketListEntry; also make the functions use this structure instead of the pair of pointers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-12-16 02:49:39 +02:00
PacketListEntry *last = NULL;
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 03:51:52 +02: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 12:04:36 +02:00
while (pktl) {
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 03:51:52 +02: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 12:04:36 +02:00
break;
avformat/mxfenc: fix muxing when audio tracks are longer than video track
2018-04-30 03:44:59 +02:00
// update last packet in packet buffer
avformat: Avoid allocation for AVStreamInternal Do this by allocating AVStream together with the data that is currently in AVStreamInternal; or rather: Put AVStream at the beginning of a new structure called FFStream (which encompasses more than just the internal fields and is a proper context in its own right, hence the name) and remove AVStreamInternal altogether. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-08-24 19:41:16 +02:00
if (ffstream(s->streams[pktl->pkt.stream_index])->last_in_packet_buffer != pktl)
ffstream(s->streams[pktl->pkt.stream_index])->last_in_packet_buffer = pktl;
set last packet next pointer to null Originally committed as revision 17176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 07:32:40 +02: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 12:04:36 +02:00
pktl = pktl->next;
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 03:51:52 +02: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 12:04:36 +02:00
}
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +02:00
// purge packet queue
while (pktl) {
avcodec/packet_internal: Add proper PacketList struct Up until now, we had a PacketList structure which is actually a PacketListEntry; a proper PacketList did not exist and all the related functions just passed pointers to pointers to the head and tail elements around. All these pointers were actually consecutive elements of their containing structs, i.e. the users already treated them as if they were a struct. So add a proper PacketList struct and rename the current PacketList to PacketListEntry; also make the functions use this structure instead of the pair of pointers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-12-16 02:49:39 +02:00
PacketListEntry *next = pktl->next;
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 08:18:25 +02: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 03:51:52 +02:00
if (last)
last->next = NULL;
else {
avcodec/packet_internal: Add proper PacketList struct Up until now, we had a PacketList structure which is actually a PacketListEntry; a proper PacketList did not exist and all the related functions just passed pointers to pointers to the head and tail elements around. All these pointers were actually consecutive elements of their containing structs, i.e. the users already treated them as if they were a struct. So add a proper PacketList struct and rename the current PacketList to PacketListEntry; also make the functions use this structure instead of the pair of pointers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-12-16 02:49:39 +02:00
si->packet_buffer.head = NULL;
si->packet_buffer.tail = NULL;
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 12:04:36 +02:00
goto out;
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 03:51:52 +02:00
}
avcodec/packet_internal: Add proper PacketList struct Up until now, we had a PacketList structure which is actually a PacketListEntry; a proper PacketList did not exist and all the related functions just passed pointers to pointers to the head and tail elements around. All these pointers were actually consecutive elements of their containing structs, i.e. the users already treated them as if they were a struct. So add a proper PacketList struct and rename the current PacketList to PacketListEntry; also make the functions use this structure instead of the pair of pointers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-12-16 02:49:39 +02:00
pktl = si->packet_buffer.head;
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +02:00
}
avformat: Avoid allocation for AVStreamInternal Do this by allocating AVStream together with the data that is currently in AVStreamInternal; or rather: Put AVStream at the beginning of a new structure called FFStream (which encompasses more than just the internal fields and is a proper context in its own right, hence the name) and remove AVStreamInternal altogether. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-08-24 19:41:16 +02:00
if (ffstream(s->streams[pktl->pkt.stream_index])->last_in_packet_buffer == pktl)
ffstream(s->streams[pktl->pkt.stream_index])->last_in_packet_buffer = NULL;
avcodec/packet_internal: Add proper PacketList struct Up until now, we had a PacketList structure which is actually a PacketListEntry; a proper PacketList did not exist and all the related functions just passed pointers to pointers to the head and tail elements around. All these pointers were actually consecutive elements of their containing structs, i.e. the users already treated them as if they were a struct. So add a proper PacketList struct and rename the current PacketList to PacketListEntry; also make the functions use this structure instead of the pair of pointers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-12-16 02:49:39 +02:00
avpriv_packet_list_get(&si->packet_buffer, out);
avformat/mux, mxfenc: Don't use sizeof(AVPacket) This removes one of the last usages of sizeof(AVPacket) in the generic muxing code. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-12-16 01:23:48 +02:00
av_log(s, AV_LOG_TRACE, "out st:%d dts:%"PRId64"\n", out->stream_index, out->dts);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +02: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 12:04:36 +02: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 08:18:25 +02:00
return 0;
}
}
avformat/mux: Use const AVPacket * in compare functions There is no reason for these functions to modify the given packets at all. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-08-13 04:47:16 +02:00
static int mxf_compare_timestamps(AVFormatContext *s, const AVPacket *next,
const AVPacket *pkt)
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +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 06:50:47 +02: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 08:18:25 +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 06:50:47 +02: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 08:18:25 +02:00
}
avformat/mux: Don't use stack packet when writing interleaved packets Currently the interleave_packet functions use a packet for a new packet to be interleaved (may be NULL if there is none) and a packet for output; said packet is always a stack packet in interleaved_write_packet(). But all the interleave_packet functions in use first move the packet to the packet list and then check whether a packet can be returned, i.e. the effective lifetime of the new packet ends before the packet for output is touched. So one can use one packet both for input and output by adding a new parameter that indicates whether there is a packet to add to the packet list; there is just one complication: In case the muxer is flushed, there is no packet available. This can be solved by reusing one of the packets from AVFormatInternal. They are currently unused when flushing in av_interleaved_write_frame(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-09-05 17:33:37 +02:00
static int mxf_interleave(AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet)
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +02:00
{
avformat: implement retiming directly in mxfenc and gxfenc Generic retime functionality is replaced by a few lines of code directly in the muxers which used it, which seems a lot easier to understand and this way the retiming is not dependant of the input durations. Also remove retimeinterleave, since it is not used by anything anymore. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-04-28 00:39:40 +02:00
int ret;
avformat/mux: Don't use stack packet when writing interleaved packets Currently the interleave_packet functions use a packet for a new packet to be interleaved (may be NULL if there is none) and a packet for output; said packet is always a stack packet in interleaved_write_packet(). But all the interleave_packet functions in use first move the packet to the packet list and then check whether a packet can be returned, i.e. the effective lifetime of the new packet ends before the packet for output is touched. So one can use one packet both for input and output by adding a new parameter that indicates whether there is a packet to add to the packet list; there is just one complication: In case the muxer is flushed, there is no packet available. This can be solved by reusing one of the packets from AVFormatInternal. They are currently unused when flushing in av_interleaved_write_frame(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-09-05 17:33:37 +02:00
if (has_packet) {
avformat: implement retiming directly in mxfenc and gxfenc Generic retime functionality is replaced by a few lines of code directly in the muxers which used it, which seems a lot easier to understand and this way the retiming is not dependant of the input durations. Also remove retimeinterleave, since it is not used by anything anymore. Signed-off-by: Marton Balint <cus@passwd.hu>
2020-04-28 00:39:40 +02:00
MXFStreamContext *sc = s->streams[pkt->stream_index]->priv_data;
pkt->pts = pkt->dts = sc->pkt_cnt++;
if ((ret = ff_interleave_add_packet(s, pkt, mxf_compare_timestamps)) < 0)
return ret;
}
avformat/mux: Don't use stack packet when writing interleaved packets Currently the interleave_packet functions use a packet for a new packet to be interleaved (may be NULL if there is none) and a packet for output; said packet is always a stack packet in interleaved_write_packet(). But all the interleave_packet functions in use first move the packet to the packet list and then check whether a packet can be returned, i.e. the effective lifetime of the new packet ends before the packet for output is touched. So one can use one packet both for input and output by adding a new parameter that indicates whether there is a packet to add to the packet list; there is just one complication: In case the muxer is flushed, there is no packet available. This can be solved by reusing one of the packets from AVFormatInternal. They are currently unused when flushing in av_interleaved_write_frame(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-09-05 17:33:37 +02:00
return mxf_interleave_get_packet(s, pkt, flush);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:18:25 +02: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 \
avformat/mxfenc: fix typo
2018-12-17 22:06:36 +02:00
{ "signal_standard", "Force/set Signal Standard",\
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
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 15:24:26 +02: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 13:29:30 +03: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 19:10:45 +03: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 13:29:30 +03: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 15:24:26 +02: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 13:29:30 +03: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
avformat/mxfenc: allow user comments for opatom muxer Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-03-11 22:22:37 +02:00
{ "store_user_comments", "",
offsetof(MXFContext, store_user_comments), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
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,
};
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
const FFOutputFormat ff_mxf_muxer = {
.p.name = "mxf",
.p.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"),
.p.mime_type = "application/mxf",
.p.extensions = "mxf",
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 23:18:12 +03:00
.priv_data_size = sizeof(MXFContext),
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.audio_codec = AV_CODEC_ID_PCM_S16LE,
.p.video_codec = AV_CODEC_ID_MPEG2VIDEO,
avformat/mxfenc: Make init function out of write_header The MXF muxers only write the header after they have received a packet; the actual write_header function does not write anything. So make an init function out of it. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 21:58:27 +02:00
.init = mxf_init,
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 23:18:12 +03:00
.write_packet = mxf_write_packet,
.write_trailer = mxf_write_footer,
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
.deinit = mxf_deinit,
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.flags = AVFMT_NOTIMESTAMPS,
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 23:18:12 +03:00
.interleave_packet = mxf_interleave,
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.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-15 00:48:02 +03:00
};
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 09:28:20 +02:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
const FFOutputFormat ff_mxf_d10_muxer = {
.p.name = "mxf_d10",
.p.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) D-10 Mapping"),
.p.mime_type = "application/mxf",
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 23:18:12 +03:00
.priv_data_size = sizeof(MXFContext),
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.audio_codec = AV_CODEC_ID_PCM_S16LE,
.p.video_codec = AV_CODEC_ID_MPEG2VIDEO,
avformat/mxfenc: Make init function out of write_header The MXF muxers only write the header after they have received a packet; the actual write_header function does not write anything. So make an init function out of it. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 21:58:27 +02:00
.init = mxf_init,
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 23:18:12 +03:00
.write_packet = mxf_write_packet,
.write_trailer = mxf_write_footer,
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
.deinit = mxf_deinit,
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.flags = AVFMT_NOTIMESTAMPS,
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 23:18:12 +03:00
.interleave_packet = mxf_interleave,
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.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 09:28:20 +02:00
};
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
const FFOutputFormat ff_mxf_opatom_muxer = {
.p.name = "mxf_opatom",
.p.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) Operational Pattern Atom"),
.p.mime_type = "application/mxf",
.p.extensions = "mxf",
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
.priv_data_size = sizeof(MXFContext),
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.audio_codec = AV_CODEC_ID_PCM_S16LE,
.p.video_codec = AV_CODEC_ID_DNXHD,
avformat/mxfenc: Make init function out of write_header The MXF muxers only write the header after they have received a packet; the actual write_header function does not write anything. So make an init function out of it. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-11-07 21:58:27 +02:00
.init = mxf_init,
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
.write_packet = mxf_write_packet,
.write_trailer = mxf_write_footer,
avformat/mxfenc: Add deinit function Fixes memleaks when allocating the private data of the timecode_track fails or when the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-01-26 12:27:38 +02:00
.deinit = mxf_deinit,
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.flags = AVFMT_NOTIMESTAMPS,
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
.interleave_packet = mxf_interleave,
avformat/avformat: Move AVOutputFormat internals out of public header This commit does for AVOutputFormat what commit 20f972701806be20a77f808db332d9489343bb78 did for AVCodec: It adds a new type FFOutputFormat, moves all the internals of AVOutputFormat to it and adds a now reduced AVOutputFormat as first member. This does not affect/improve extensibility of both public or private fields for muxers (it is still a mess due to lavd). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2023-01-27 16:06:00 +02:00
.p.priv_class = &mxf_opatom_muxer_class,
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 05:44:21 +02:00
};
Reference in New Issue Copy Permalink