FFmpeg/FFmpeg

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1

/*

replace coder/decoder file description in libavformat by muxer/demuxer

Oct 23, 2006

2

* MOV, 3GP, MP4 muxer

cosmetics: Remove pointless period after copyright statement non-sent…

Jan 19, 2009

3

4

typo in the mail, the 4am commit is always the worst

Mar 15, 2009

5

 * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6

*

Change license headers to say 'FFmpeg' instead of 'this program/this …

Oct 7, 2006

7

* This file is part of FFmpeg.

8

*

9

* FFmpeg is free software; you can redistribute it and/or

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

10

* modify it under the terms of the GNU Lesser General Public

11

* License as published by the Free Software Foundation; either

Change license headers to say 'FFmpeg' instead of 'this program/this …

Oct 7, 2006

12

* version 2.1 of the License, or (at your option) any later version.

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

13

*

Change license headers to say 'FFmpeg' instead of 'this program/this …

Oct 7, 2006

14

* FFmpeg is distributed in the hope that it will be useful,

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

15

* but WITHOUT ANY WARRANTY; without even the implied warranty of

16

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

17

* Lesser General Public License for more details.

18

*

19

* You should have received a copy of the GNU Lesser General Public

Change license headers to say 'FFmpeg' instead of 'this program/this …

Oct 7, 2006

20

* License along with FFmpeg; if not, write to the Free Software

Update licensing information: The FSF changed postal address.

Jan 12, 2006

21

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

22

*/

cosmetics

Mar 15, 2009

23

Add missing #includes for *INT64_MAX and *INT64_C

Nov 23, 2013

24

#include <stdint.h>

More correct printf format specifiers

Apr 1, 2014

25

#include <inttypes.h>

Add missing #includes for *INT64_MAX and *INT64_C

Nov 23, 2013

26

Move the mov muxer structures to a separate header

May 18, 2010

27

#include "movenc.h"

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

28

#include "avformat.h"

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

29

#include "avio_internal.h"

move common stuff from avienc.c and wav.c to new file riff.c

Jul 12, 2006

30

#include "riff.h"

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

31

#include "avio.h"

move common code from mov.c and movenc.c to isom.c

Aug 1, 2006

32

#include "isom.h"

Move isom_write_avcc() and related functions into a separate file.

Jan 11, 2008

33

#include "avc.h"

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

34

#include "libavcodec/ac3_parser.h"

libavformat/movenc: add dnxhr compatibility for apple players

Jul 22, 2016

35

#include "libavcodec/dnxhddata.h"

Rename bitstream.h to get_bits.h.

Apr 13, 2009

36

#include "libavcodec/get_bits.h"

Split bitstream.h, put the bitstream writer stuff in the new file

Apr 12, 2009

37

#include "libavcodec/put_bits.h"

vc1: Split bits used in libavformat into a separate header

Sep 1, 2014

38

#include "libavcodec/vc1_common.h"

Warn if rawvideo and an unreadable pix_fmt are written.

Apr 11, 2014

39

#include "libavcodec/raw.h"

Add initial support for RTP hinting in the mov muxer

May 18, 2010

40

#include "internal.h"

41

#include "libavutil/avstring.h"

lavu: replace int/float punning functions

Nov 27, 2011

42

#include "libavutil/intfloat.h"

Do not include mathematics.h in avutil.h

Jun 4, 2011

43

#include "libavutil/mathematics.h"

avformat/movenc: Add support for writing 'gama' atom to QuickTime .mo…

Mar 5, 2015

44

#include "libavutil/libm.h"

movenc: Add an AVClass for setting muxer specific options

May 21, 2011

45

#include "libavutil/opt.h"

Remove all uses of now deprecated metadata functions.

May 22, 2011

46

#include "libavutil/dict.h"

Warn if rawvideo and an unreadable pix_fmt are written.

Apr 11, 2014

47

#include "libavutil/pixdesc.h"

Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'

Sep 4, 2014

48

#include "libavutil/timecode.h"

avformat/movenc: Add support for writing 'gama' atom to QuickTime .mo…

Mar 5, 2015

49

#include "libavutil/color_utils.h"

movenc: write hvcC tag for HEVC.

Mar 3, 2014

50

#include "hevc.h"

movenc: Add RTP muxer/hinter options

May 21, 2011

51

#include "rtpenc.h"

mov: add support for reading and writing the 'chan' tag

Dec 3, 2011

52

#include "mov_chan.h"

Add experimental support for vp9 in iso-bmff

Jun 15, 2016

53

#include "vpcc.h"

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

54

movenc: Add an AVClass for setting muxer specific options

May 21, 2011

55

static const AVOption options[] = {

avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member

Aug 31, 2012

56

    { "movflags", "MOV muxer flags", offsetof(MOVMuxContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Aug 31, 2012

57

    { "rtphint", "Add RTP hint tracks", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_RTP_HINT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

Sep 5, 2012

58

    { "moov_size", "maximum moov size so it can be placed at the begin", offsetof(MOVMuxContext, reserved_moov_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, 0 },

movenc: Remove an outdated comment

Nov 3, 2014

59

    { "empty_moov", "Make the initial moov atom empty", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_EMPTY_MOOV}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Aug 31, 2012

60

    { "frag_keyframe", "Fragment at video keyframes", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_KEYFRAME}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

61

    { "separate_moof", "Write separate moof/mdat atoms for each track", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_SEPARATE_MOOF}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

62

    { "frag_custom", "Flush fragments on caller requests", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_CUSTOM}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

63

    { "isml", "Create a live smooth streaming feed (for pushing to a publishing point)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_ISML}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: add faststart option for web streaming

Aug 19, 2013

64

    { "faststart", "Run a second pass to put the index (moov atom) at the beginning of the file", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FASTSTART}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add an option for omitting the tfhd base offset

Sep 9, 2013

65

    { "omit_tfhd_offset", "Omit the base data offset in tfhd atoms", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_OMIT_TFHD_OFFSET}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add option to disable nero chapters

Aug 4, 2014

66

    { "disable_chpl", "Disable Nero chapter atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DISABLE_CHPL}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add a flag for using default-base-is-moof in tfhd atoms

Oct 29, 2014

67

    { "default_base_moof", "Set the default-base-is-moof flag in tfhd atoms", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DEFAULT_BASE_MOOF}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

68

    { "dash", "Write DASH compatible fragmented MP4", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DASH}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add a flag for indicating a discontinuous fragment

Nov 20, 2014

69

    { "frag_discont", "Signal that the next fragment is discontinuous from earlier ones", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_DISCONT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

70

    { "delay_moov", "Delay writing the initial moov until the first fragment is cut, or until the first fragment flush", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DELAY_MOOV}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

71

    { "global_sidx", "Write a global sidx index at the start of the file", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_GLOBAL_SIDX}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

avformat/movenc: mark write_colr as experimental

Mar 4, 2015

72

    { "write_colr", "Write colr atom (Experimental, may be renamed or changed, do not use from scripts)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_COLR}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

avformat/movenc: Add support for writing 'gama' atom to QuickTime .mo…

Mar 5, 2015

73

    { "write_gama", "Write deprecated gama atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_GAMA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

avformat/movenc: add option to use keys/mdta atoms for metadata

Jun 22, 2016

74

    { "use_metadata_tags", "Use mdta atom for metadata.", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_USE_MDTA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

movenc: Add an option for skipping writing the mfra/tfra/mfro trailer

Jun 13, 2016

75

    { "skip_trailer", "Skip writing the mfra/tfra/mfro trailer for fragmented files", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_SKIP_TRAILER}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.

Jul 21, 2012

76

FF_RTP_FLAG_OPTS(MOVMuxContext, rtp_flags),

avformat: use AV_OPT_TYPE_BOOL in a bunch of places

Nov 21, 2015

77

    { "skip_iods", "Skip writing iods atom.", offsetof(MOVMuxContext, iods_skip), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},

avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member

Aug 31, 2012

78

    { "iods_audio_profile", "iods audio profile atom.", offsetof(MOVMuxContext, iods_audio_profile), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM},

79

    { "iods_video_profile", "iods video profile atom.", offsetof(MOVMuxContext, iods_video_profile), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM},

80

    { "frag_duration", "Maximum fragment duration", offsetof(MOVMuxContext, max_fragment_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

81

    { "min_frag_duration", "Minimum fragment duration", offsetof(MOVMuxContext, min_fragment_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

82

    { "frag_size", "Maximum fragment size", offsetof(MOVMuxContext, max_fragment_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

83

    { "ism_lookahead", "Number of lookahead entries for ISM files", offsetof(MOVMuxContext, ism_lookahead), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

movenc: add video_track_timescale option

May 16, 2013

84

    { "video_track_timescale", "set timescale of all video tracks", offsetof(MOVMuxContext, video_track_timescale), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

movenc: Allow override of major brand in ftyp atom

Mar 18, 2014

85

    { "brand",    "Override major brand", offsetof(MOVMuxContext, major_brand),   AV_OPT_TYPE_STRING, {.str = NULL}, .flags = AV_OPT_FLAG_ENCODING_PARAM },

avformat: use AV_OPT_TYPE_BOOL in a bunch of places

Nov 21, 2015

86

    { "use_editlist", "use edit list", offsetof(MOVMuxContext, use_editlist), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

87

    { "fragment_index", "Fragment number of the next fragment", offsetof(MOVMuxContext, fragments), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

avformat/movenc: Add support for writing 'gama' atom to QuickTime .mo…

Mar 5, 2015

88

    { "mov_gamma", "gamma value for gama atom", offsetof(MOVMuxContext, gamma), AV_OPT_TYPE_FLOAT, {.dbl = 0.0 }, 0.0, 10, AV_OPT_FLAG_ENCODING_PARAM},

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

89

    { "frag_interleave", "Interleave samples within fragments (max number of consecutive samples, lower is tighter interleaving, but with more overhead)", offsetof(MOVMuxContext, frag_interleave), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },

lavf/movenc: Fix help output.

Mar 10, 2016

90

    { "encryption_scheme",    "Configures the encryption scheme, allowed values are none, cenc-aes-ctr", offsetof(MOVMuxContext, encryption_scheme_str),   AV_OPT_TYPE_STRING, {.str = NULL}, .flags = AV_OPT_FLAG_ENCODING_PARAM },

91

    { "encryption_key", "The media encryption key (hex)", offsetof(MOVMuxContext, encryption_key), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM },

92

    { "encryption_kid", "The media encryption key identifier (hex)", offsetof(MOVMuxContext, encryption_kid), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM },

avformat/movenc: added ability to use original stream ids as track id…

Aug 31, 2016

93

    { "use_stream_ids_as_track_ids", "use stream ids as track ids", offsetof(MOVMuxContext, use_stream_ids_as_track_ids), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},

lavf/movenc: Allow to disable writing the timecode track.

Sep 26, 2016

94

    { "write_tmcd", "force or disable writing tmcd", offsetof(MOVMuxContext, write_tmcd), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},

movenc: Add an AVClass for setting muxer specific options

May 21, 2011

95

{ NULL },

96

};

97

lavc/lavf: use unique private classes.

Oct 3, 2011

98

#define MOV_CLASS(flavor)\

99

static const AVClass flavor ## _muxer_class = {\

100

.class_name = #flavor " muxer",\

101

.item_name = av_default_item_name,\

102

.option = options,\

103

.version = LIBAVUTIL_VERSION_INT,\

movenc: Add an AVClass for setting muxer specific options

May 21, 2011

104

};

105

Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'

Aug 22, 2013

106

static int get_moov_size(AVFormatContext *s);

107

movenc: add track title to tracks

Jul 31, 2014

108

static int utf8len(const uint8_t *b)

109

{

110

int len = 0;

111

int val;

112

while (*b) {

113

GET_UTF8(val, *b++, return -1;)

114

len++;

115

}

116

return len;

117

}

118

misc typo fixes

Jun 12, 2007

119

//FIXME support 64 bit variant with wide placeholders

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

120

static int64_t update_size(AVIOContext *pb, int64_t pos)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

121

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

122

int64_t curpos = avio_tell(pb);

avio: avio_ prefix for url_fseek

Feb 28, 2011

123

avio_seek(pb, pos, SEEK_SET);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

124

avio_wb32(pb, curpos - pos); /* rewrite size */

avio: avio_ prefix for url_fseek

Feb 28, 2011

125

avio_seek(pb, curpos, SEEK_SET);

mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global head…

Sep 9, 2003

126

127

return curpos - pos;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

128

}

129

movenc: fix detection of 64bit offset requirement

Aug 20, 2013

130

static int co64_required(const MOVTrack *track)

lavf/movenc: make mov_write_stco_tag() not use the offset pos for mod…

Sep 20, 2012

131

{

movenc: fix detection of 64bit offset requirement

Aug 20, 2013

132

    if (track->entry > 0 && track->cluster[track->entry - 1].pos + track->data_offset > UINT32_MAX)

133

return 1;

lavf/movenc: make mov_write_stco_tag() not use the offset pos for mod…

Sep 20, 2012

134

return 0;

135

}

136

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

137

/* Chunk offset atom */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

138

static int mov_write_stco_tag(AVIOContext *pb, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

139

{

140

int i;

movenc: fix detection of 64bit offset requirement

Aug 20, 2013

141

int mode64 = co64_required(track); // use 32 bit size variant if possible

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

142

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

143

avio_wb32(pb, 0); /* size */

lavf/movenc: make mov_write_stco_tag() not use the offset pos for mod…

Sep 20, 2012

144

if (mode64)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

145

ffio_wfourcc(pb, "co64");

lavf/movenc: make mov_write_stco_tag() not use the offset pos for mod…

Sep 20, 2012

146

else

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

147

ffio_wfourcc(pb, "stco");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

148

avio_wb32(pb, 0); /* version & flags */

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

149

avio_wb32(pb, track->chunkCount); /* entry count */

movenc: K&R formatting cosmetics

Jul 7, 2013

150

for (i = 0; i < track->entry; i++) {

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

151

if (!track->cluster[i].chunkNum)

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

152

continue;

movenc: K&R formatting cosmetics

Jul 7, 2013

153

if (mode64 == 1)

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

154

avio_wb64(pb, track->cluster[i].pos + track->data_offset);

>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)

Jan 23, 2006

155

else

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

156

avio_wb32(pb, track->cluster[i].pos + track->data_offset);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

157

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

158

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

159

}

160

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

161

/* Sample size atom */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

162

static int mov_write_stsz_tag(AVIOContext *pb, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

163

{

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

164

int equalChunks = 1;

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

165

int i, j, entries = 0, tst = -1, oldtst = -1;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

166

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

167

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

168

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

169

ffio_wfourcc(pb, "stsz");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

170

avio_wb32(pb, 0); /* version & flags */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

171

movenc: K&R formatting cosmetics

Jul 7, 2013

172

for (i = 0; i < track->entry; i++) {

173

tst = track->cluster[i].size / track->cluster[i].entries;

174

if (oldtst != -1 && tst != oldtst)

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

175

equalChunks = 0;

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

176

oldtst = tst;

simplify

Jun 24, 2006

177

entries += track->cluster[i].entries;

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

178

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

179

if (equalChunks && track->entry) {

movenc: K&R formatting cosmetics

Jul 7, 2013

180

        int sSize = track->entry ? track->cluster[0].size / track->cluster[0].entries : 0;

In mov muxer, fix adpcm mono muxing, patch by Alex Converse

Feb 28, 2011

181

sSize = FFMAX(1, sSize); // adpcm mono case could make sSize == 0

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

182

avio_wb32(pb, sSize); // sample size

183

avio_wb32(pb, entries); // sample count

movenc: K&R formatting cosmetics

Jul 7, 2013

184

} else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

185

avio_wb32(pb, 0); // sample size

186

avio_wb32(pb, entries); // sample count

movenc: K&R formatting cosmetics

Jul 7, 2013

187

for (i = 0; i < track->entry; i++) {

188

for (j = 0; j < track->cluster[i].entries; j++) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

189

avio_wb32(pb, track->cluster[i].size /

movenc: K&R formatting cosmetics

Jul 7, 2013

190

track->cluster[i].entries);

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

191

}

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

192

}

193

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

194

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

195

}

196

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

197

/* Sample to chunk atom */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

198

static int mov_write_stsc_tag(AVIOContext *pb, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

199

{

>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)

Jan 23, 2006

200

int index = 0, oldval = -1, i;

Remove offset_t typedef and use int64_t directly instead.

Oct 3, 2008

201

int64_t entryPos, curpos;

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

202

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

203

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

204

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

205

ffio_wfourcc(pb, "stsc");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

206

avio_wb32(pb, 0); // version & flags

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

207

entryPos = avio_tell(pb);

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

208

avio_wb32(pb, track->chunkCount); // entry count

movenc: K&R formatting cosmetics

Jul 7, 2013

209

for (i = 0; i < track->entry; i++) {

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

210

        if (oldval != track->cluster[i].samples_in_chunk && track->cluster[i].chunkNum) {

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

211

avio_wb32(pb, track->cluster[i].chunkNum); // first chunk

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

212

avio_wb32(pb, track->cluster[i].samples_in_chunk); // samples per chunk

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

213

avio_wb32(pb, 0x1); // sample description index

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

214

oldval = track->cluster[i].samples_in_chunk;

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

215

index++;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

216

}

217

}

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

218

curpos = avio_tell(pb);

avio: avio_ prefix for url_fseek

Feb 28, 2011

219

avio_seek(pb, entryPos, SEEK_SET);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

220

avio_wb32(pb, index); // rewrite size

avio: avio_ prefix for url_fseek

Feb 28, 2011

221

avio_seek(pb, curpos, SEEK_SET);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

222

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

223

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

224

}

225

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

226

/* Sync sample atom */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

227

static int mov_write_stss_tag(AVIOContext *pb, MOVTrack *track, uint32_t flag)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

228

{

Remove offset_t typedef and use int64_t directly instead.

Oct 3, 2008

229

int64_t curpos, entryPos;

>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)

Jan 23, 2006

230

int i, index = 0;

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

231

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

232

avio_wb32(pb, 0); // size

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

233

ffio_wfourcc(pb, flag == MOV_SYNC_SAMPLE ? "stss" : "stps");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

234

avio_wb32(pb, 0); // version & flags

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

235

entryPos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

236

avio_wb32(pb, track->entry); // entry count

movenc: K&R formatting cosmetics

Jul 7, 2013

237

for (i = 0; i < track->entry; i++) {

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

238

if (track->cluster[i].flags & flag) {

movenc: K&R formatting cosmetics

Jul 7, 2013

239

avio_wb32(pb, i + 1);

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

240

index++;

241

}

242

}

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

243

curpos = avio_tell(pb);

avio: avio_ prefix for url_fseek

Feb 28, 2011

244

avio_seek(pb, entryPos, SEEK_SET);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

245

avio_wb32(pb, index); // rewrite size

avio: avio_ prefix for url_fseek

Feb 28, 2011

246

avio_seek(pb, curpos, SEEK_SET);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

247

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

248

}

249

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

250

static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

251

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

252

avio_wb32(pb, 0x11); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

253

if (track->mode == MODE_MOV) ffio_wfourcc(pb, "samr");

254

else ffio_wfourcc(pb, "damr");

255

ffio_wfourcc(pb, "FFMP");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

256

avio_w8(pb, 0); /* decoder version */

fix AMR muxing in mov

May 13, 2006

257

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

258

avio_wb16(pb, 0x81FF); /* Mode set (all modes for AMR_NB) */

259

avio_w8(pb, 0x00); /* Mode change period (no restriction) */

260

avio_w8(pb, 0x01); /* Frames per sample */

fix AMR muxing in mov

May 13, 2006

261

return 0x11;

262

}

263

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

264

static int mov_write_ac3_tag(AVIOContext *pb, MOVTrack *track)

ac3 muxing support in mov/mp4/m4v

Sep 3, 2008

265

{

266

GetBitContext gbc;

267

PutBitContext pbc;

268

uint8_t buf[3];

269

int fscod, bsid, bsmod, acmod, lfeon, frmsizecod;

270

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

271

if (track->vos_len < 7)

ac3 muxing support in mov/mp4/m4v

Sep 3, 2008

272

return -1;

273

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

274

avio_wb32(pb, 11);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

275

ffio_wfourcc(pb, "dac3");

ac3 muxing support in mov/mp4/m4v

Sep 3, 2008

276

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

277

init_get_bits(&gbc, track->vos_data + 4, (track->vos_len - 4) * 8);

ac3 muxing support in mov/mp4/m4v

Sep 3, 2008

278

fscod = get_bits(&gbc, 2);

279

frmsizecod = get_bits(&gbc, 6);

280

bsid = get_bits(&gbc, 5);

281

bsmod = get_bits(&gbc, 3);

282

acmod = get_bits(&gbc, 3);

283

if (acmod == 2) {

284

skip_bits(&gbc, 2); // dsurmod

285

} else {

286

if ((acmod & 1) && acmod != 1)

287

skip_bits(&gbc, 2); // cmixlev

288

if (acmod & 4)

289

skip_bits(&gbc, 2); // surmixlev

290

}

291

lfeon = get_bits1(&gbc);

292

293

init_put_bits(&pbc, buf, sizeof(buf));

294

put_bits(&pbc, 2, fscod);

295

put_bits(&pbc, 5, bsid);

296

put_bits(&pbc, 3, bsmod);

297

put_bits(&pbc, 3, acmod);

298

put_bits(&pbc, 1, lfeon);

movenc: K&R formatting cosmetics

Jul 7, 2013

299

put_bits(&pbc, 5, frmsizecod >> 1); // bit_rate_code

ac3 muxing support in mov/mp4/m4v

Sep 3, 2008

300

put_bits(&pbc, 5, 0); // reserved

301

302

flush_put_bits(&pbc);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

303

avio_write(pb, buf, sizeof(buf));

ac3 muxing support in mov/mp4/m4v

Sep 3, 2008

304

305

return 11;

306

}

307

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

308

struct eac3_info {

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

309

AVPacket pkt;

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

310

uint8_t ec3_done;

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

311

uint8_t num_blocks;

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

312

313

/* Layout of the EC3SpecificBox */

314

/* maximum bitrate */

315

uint16_t data_rate;

316

/* number of independent substreams */

317

uint8_t num_ind_sub;

318

struct {

319

/* sample rate code (see ff_ac3_sample_rate_tab) 2 bits */

320

uint8_t fscod;

321

/* bit stream identification 5 bits */

322

uint8_t bsid;

323

/* one bit reserved */

324

/* audio service mixing (not supported yet) 1 bit */

325

/* bit stream mode 3 bits */

326

uint8_t bsmod;

327

/* audio coding mode 3 bits */

328

uint8_t acmod;

329

/* sub woofer on 1 bit */

330

uint8_t lfeon;

331

/* 3 bits reserved */

332

/* number of dependent substreams associated with this substream 4 bits */

333

uint8_t num_dep_sub;

334

/* channel locations of the dependent substream(s), if any, 9 bits */

335

uint16_t chan_loc;

336

/* if there is no dependent substream, then one bit reserved instead */

337

} substream[1]; /* TODO: support 8 independent substreams */

338

};

339

Fix standalone compilation of the mov muxer with --disable-optimizati…

Feb 8, 2015

340

#if CONFIG_AC3_PARSER

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

341

static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)

342

{

343

GetBitContext gbc;

344

AC3HeaderInfo tmp, *hdr = &tmp;

345

struct eac3_info *info;

346

int num_blocks;

347

348

if (!track->eac3_priv && !(track->eac3_priv = av_mallocz(sizeof(*info))))

349

return AVERROR(ENOMEM);

350

info = track->eac3_priv;

351

352

init_get_bits(&gbc, pkt->data, pkt->size * 8);

avcodec: drop 2 suffix from avpriv_ac3_parse_header2

Oct 16, 2015

353

if (avpriv_ac3_parse_header(&gbc, &hdr) < 0) {

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

354

/* drop the packets until we see a good one */

355

if (!track->entry) {

356

            av_log(mov, AV_LOG_WARNING, "Dropping invalid packet from start of the stream\n");

357

return 0;

358

}

359

return AVERROR_INVALIDDATA;

360

}

361

362

info->data_rate = FFMAX(info->data_rate, hdr->bit_rate / 1000);

363

num_blocks = hdr->num_blocks;

364

365

if (!info->ec3_done) {

366

/* AC-3 substream must be the first one */

367

if (hdr->bitstream_id <= 10 && hdr->substreamid != 0)

368

return AVERROR(EINVAL);

369

370

/* this should always be the case, given that our AC-3 parser

371

* concatenates dependent frames to their independent parent */

372

if (hdr->frame_type == EAC3_FRAME_TYPE_INDEPENDENT) {

373

/* substream ids must be incremental */

374

if (hdr->substreamid > info->num_ind_sub + 1)

375

return AVERROR(EINVAL);

376

377

if (hdr->substreamid == info->num_ind_sub + 1) {

378

//info->num_ind_sub++;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

379

avpriv_request_sample(track->par, "Multiple independent substreams");

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

380

return AVERROR_PATCHWELCOME;

381

} else if (hdr->substreamid < info->num_ind_sub ||

382

hdr->substreamid == 0 && info->substream[0].bsid) {

383

info->ec3_done = 1;

384

goto concatenate;

385

}

386

}

387

388

/* fill the info needed for the "dec3" atom */

389

info->substream[hdr->substreamid].fscod = hdr->sr_code;

390

info->substream[hdr->substreamid].bsid = hdr->bitstream_id;

391

info->substream[hdr->substreamid].bsmod = hdr->bitstream_mode;

392

info->substream[hdr->substreamid].acmod = hdr->channel_mode;

393

info->substream[hdr->substreamid].lfeon = hdr->lfe_on;

394

395

/* Parse dependent substream(s), if any */

396

if (pkt->size != hdr->frame_size) {

397

int cumul_size = hdr->frame_size;

398

int parent = hdr->substreamid;

399

400

while (cumul_size != pkt->size) {

401

int i;

402

init_get_bits(&gbc, pkt->data + cumul_size, (pkt->size - cumul_size) * 8);

avcodec: drop 2 suffix from avpriv_ac3_parse_header2

Oct 16, 2015

403

if (avpriv_ac3_parse_header(&gbc, &hdr) < 0)

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

404

return AVERROR_INVALIDDATA;

405

if (hdr->frame_type != EAC3_FRAME_TYPE_DEPENDENT)

406

return AVERROR(EINVAL);

407

cumul_size += hdr->frame_size;

408

info->substream[parent].num_dep_sub++;

409

410

/* header is parsed up to lfeon, but custom channel map may be needed */

411

/* skip bsid */

412

skip_bits(&gbc, 5);

413

/* skip volume control params */

414

for (i = 0; i < (hdr->channel_mode ? 1 : 2); i++) {

415

skip_bits(&gbc, 5); // skip dialog normalization

416

if (get_bits1(&gbc)) {

417

skip_bits(&gbc, 8); // skip compression gain word

418

}

419

}

420

/* get the dependent stream channel map, if exists */

421

if (get_bits1(&gbc))

422

info->substream[parent].chan_loc |= (get_bits(&gbc, 16) >> 5) & 0x1f;

423

else

424

info->substream[parent].chan_loc |= hdr->channel_mode;

425

}

426

}

427

}

428

429

concatenate:

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

430

if (!info->num_blocks && num_blocks == 6)

431

return pkt->size;

432

else if (info->num_blocks + num_blocks > 6)

433

return AVERROR_INVALIDDATA;

434

435

if (!info->num_blocks) {

436

int ret;

437

if ((ret = av_copy_packet(&info->pkt, pkt)) < 0)

438

return ret;

439

info->num_blocks = num_blocks;

440

return 0;

441

} else {

442

int ret;

443

if ((ret = av_grow_packet(&info->pkt, pkt->size)) < 0)

444

return ret;

445

memcpy(info->pkt.data + info->pkt.size - pkt->size, pkt->data, pkt->size);

446

info->num_blocks += num_blocks;

447

info->pkt.duration += pkt->duration;

448

if ((ret = av_copy_packet_side_data(&info->pkt, pkt)) < 0)

449

return ret;

450

if (info->num_blocks != 6)

451

return 0;

Replace remaining occurances of av_free_packet with av_packet_unref

Oct 27, 2015

452

av_packet_unref(pkt);

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

453

if ((ret = av_copy_packet(pkt, &info->pkt)) < 0)

454

return ret;

Replace remaining occurances of av_free_packet with av_packet_unref

Oct 27, 2015

455

av_packet_unref(&info->pkt);

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

456

info->num_blocks = 0;

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

457

}

458

459

return pkt->size;

460

}

Fix standalone compilation of the mov muxer with --disable-optimizati…

Feb 8, 2015

461

#endif

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

462

463

static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track)

464

{

465

PutBitContext pbc;

466

uint8_t *buf;

467

struct eac3_info *info;

468

int size, i;

469

470

if (!track->eac3_priv)

471

return AVERROR(EINVAL);

472

473

info = track->eac3_priv;

474

size = 2 + 4 * (info->num_ind_sub + 1);

475

buf = av_malloc(size);

476

if (!buf) {

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

477

size = AVERROR(ENOMEM);

478

goto end;

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

479

}

480

481

init_put_bits(&pbc, buf, size);

482

put_bits(&pbc, 13, info->data_rate);

483

put_bits(&pbc, 3, info->num_ind_sub);

484

for (i = 0; i <= info->num_ind_sub; i++) {

485

put_bits(&pbc, 2, info->substream[i].fscod);

486

put_bits(&pbc, 5, info->substream[i].bsid);

487

put_bits(&pbc, 1, 0); /* reserved */

488

put_bits(&pbc, 1, 0); /* asvc */

489

put_bits(&pbc, 3, info->substream[i].bsmod);

490

put_bits(&pbc, 3, info->substream[i].acmod);

491

put_bits(&pbc, 1, info->substream[i].lfeon);

492

put_bits(&pbc, 5, 0); /* reserved */

493

put_bits(&pbc, 4, info->substream[i].num_dep_sub);

494

if (!info->substream[i].num_dep_sub) {

495

put_bits(&pbc, 1, 0); /* reserved */

496

size--;

497

} else {

498

put_bits(&pbc, 9, info->substream[i].chan_loc);

499

}

500

}

501

flush_put_bits(&pbc);

502

503

avio_wb32(pb, size + 8);

504

ffio_wfourcc(pb, "dec3");

505

avio_write(pb, buf, size);

506

507

av_free(buf);

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

508

509

end:

Replace remaining occurances of av_free_packet with av_packet_unref

Oct 27, 2015

510

av_packet_unref(&info->pkt);

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

511

av_freep(&track->eac3_priv);

512

513

return size;

514

}

515

support for alac in .mov

Apr 24, 2008

516

/**

517

* This function writes extradata "as is".

Fix a bunch of common typos.

Oct 5, 2011

518

* Extradata must be formatted like a valid atom (with size and tag).

support for alac in .mov

Apr 24, 2008

519

*/

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

520

static int mov_write_extradata_tag(AVIOContext *pb, MOVTrack *track)

support for alac in .mov

Apr 24, 2008

521

{

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

522

avio_write(pb, track->par->extradata, track->par->extradata_size);

523

return track->par->extradata_size;

support for alac in .mov

Apr 24, 2008

524

}

525

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

526

static int mov_write_enda_tag(AVIOContext *pb)

add pcm 24/32 le/be support

May 13, 2006

527

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

528

avio_wb32(pb, 10);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

529

ffio_wfourcc(pb, "enda");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

530

avio_wb16(pb, 1); /* little endian */

add pcm 24/32 le/be support

May 13, 2006

531

return 10;

532

}

533

movenc.c: Add support for >16bit BE flavours

Oct 2, 2012

534

static int mov_write_enda_tag_be(AVIOContext *pb)

535

{

536

avio_wb32(pb, 10);

537

ffio_wfourcc(pb, "enda");

538

avio_wb16(pb, 0); /* big endian */

539

return 10;

540

}

541

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

542

static void put_descr(AVIOContext *pb, int tag, unsigned int size)

clean and simplify

May 13, 2006

543

{

In ipod/mov/mp4 muxer, always write esds descriptor length using 4 by…

Mar 30, 2011

544

int i = 3;

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

545

avio_w8(pb, tag);

movenc: K&R formatting cosmetics

Jul 7, 2013

546

for (; i > 0; i--)

547

avio_w8(pb, (size >> (7 * i)) | 0x80);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

548

avio_w8(pb, size & 0x7F);

clean and simplify

May 13, 2006

549

}

550

In mov muxer, compute avg bitrate in esds

Apr 16, 2011

551

static unsigned compute_avg_bitrate(MOVTrack *track)

552

{

553

uint64_t size = 0;

554

int i;

movenc: fix crashes if a stream is empty.

Feb 12, 2012

555

if (!track->track_duration)

556

return 0;

In mov muxer, compute avg bitrate in esds

Apr 16, 2011

557

for (i = 0; i < track->entry; i++)

558

size += track->cluster[i].size;

Merge remote-tracking branch 'qatar/master'

Jan 31, 2012

559

return size * 8 * track->timescale / track->track_duration;

In mov muxer, compute avg bitrate in esds

Apr 16, 2011

560

}

561

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

562

static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic

clean and simplify

May 13, 2006

563

{

movenc: use the CPB props side data

Oct 4, 2015

564

AVCPBProperties *props;

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

565

int64_t pos = avio_tell(pb);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

566

int decoder_specific_info_len = track->vos_len ? 5 + track->vos_len : 0;

In mov muxer, compute avg bitrate in esds

Apr 16, 2011

567

unsigned avg_bitrate;

clean and simplify

May 13, 2006

568

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

569

avio_wb32(pb, 0); // size

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

570

ffio_wfourcc(pb, "esds");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

571

avio_wb32(pb, 0); // Version

clean and simplify

May 13, 2006

572

573

// ES descriptor

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

574

put_descr(pb, 0x03, 3 + 5+13 + decoder_specific_info_len + 5+1);

575

avio_wb16(pb, track->track_id);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

576

avio_w8(pb, 0x00); // flags (= no flags)

clean and simplify

May 13, 2006

577

578

// DecoderConfig descriptor

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

579

put_descr(pb, 0x04, 13 + decoder_specific_info_len);

clean and simplify

May 13, 2006

580

581

// Object type indication

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

582

if ((track->par->codec_id == AV_CODEC_ID_MP2 ||

583

track->par->codec_id == AV_CODEC_ID_MP3) &&

584

track->par->sample_rate > 24000)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

585

avio_w8(pb, 0x6B); // 11172-3

correctly mux mpeg2 audio 13818-3 in mp4

Sep 2, 2008

586

else

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

587

avio_w8(pb, ff_codec_get_tag(ff_mp4_obj_type, track->par->codec_id));

clean and simplify

May 13, 2006

588

589

    // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)

590

// plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

591

if (track->par->codec_id == AV_CODEC_ID_DVD_SUBTITLE)

movenc: Add dvd subtitle support

Mar 18, 2014

592

avio_w8(pb, (0x38 << 2) | 1); // flags (= NeroSubpicStream)

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

593

else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

594

avio_w8(pb, 0x15); // flags (= Audiostream)

clean and simplify

May 13, 2006

595

else

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

596

avio_w8(pb, 0x11); // flags (= Visualstream)

clean and simplify

May 13, 2006

597

movenc: use the CPB props side data

Oct 4, 2015

598

    props = (AVCPBProperties*)av_stream_get_side_data(track->st, AV_PKT_DATA_CPB_PROPERTIES,

599

NULL);

clean and simplify

May 13, 2006

600

movenc: use the CPB props side data

Oct 4, 2015

601

avio_wb24(pb, props ? props->buffer_size / 8 : 0); // Buffersize DB

clean and simplify

May 13, 2006

602

In mov muxer, compute avg bitrate in esds

Apr 16, 2011

603

avg_bitrate = compute_avg_bitrate(track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

604

    avio_wb32(pb, props ? FFMAX3(props->max_bitrate, props->avg_bitrate, avg_bitrate) : FFMAX(track->par->bit_rate, avg_bitrate)); // maxbitrate (FIXME should be max rate in any 1 sec window)

In mov muxer, compute avg bitrate in esds

Apr 16, 2011

605

avio_wb32(pb, avg_bitrate);

clean and simplify

May 13, 2006

606

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

607

if (track->vos_len) {

clean and simplify

May 13, 2006

608

// DecoderSpecific info descriptor

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

609

put_descr(pb, 0x05, track->vos_len);

610

avio_write(pb, track->vos_data, track->vos_len);

clean and simplify

May 13, 2006

611

}

612

613

// SL descriptor

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

614

put_descr(pb, 0x06, 1);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

615

avio_w8(pb, 0x02);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

616

return update_size(pb, pos);

clean and simplify

May 13, 2006

617

}

618

rename missed CodecID to AVCodecID

Aug 7, 2012

619

static int mov_pcm_le_gt16(enum AVCodecID codec_id)

support pcm_f32/64le in mov

Nov 29, 2009

620

{

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

Aug 7, 2012

621

return codec_id == AV_CODEC_ID_PCM_S24LE ||

622

codec_id == AV_CODEC_ID_PCM_S32LE ||

623

codec_id == AV_CODEC_ID_PCM_F32LE ||

624

codec_id == AV_CODEC_ID_PCM_F64LE;

support pcm_f32/64le in mov

Nov 29, 2009

625

}

626

movenc.c: Add support for >16bit BE flavours

Oct 2, 2012

627

static int mov_pcm_be_gt16(enum AVCodecID codec_id)

628

{

629

return codec_id == AV_CODEC_ID_PCM_S24BE ||

630

codec_id == AV_CODEC_ID_PCM_S32BE ||

631

codec_id == AV_CODEC_ID_PCM_F32BE ||

632

codec_id == AV_CODEC_ID_PCM_F64BE;

633

}

634

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

635

static int mov_write_ms_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)

In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime suppor…

Jan 20, 2011

636

{

avformat/movenc: Check ff_put_wav_header() return code

May 10, 2014

637

int ret;

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

638

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

639

avio_wb32(pb, 0);

640

avio_wl32(pb, track->tag); // store it byteswapped

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

641

track->par->codec_tag = av_bswap16(track->tag >> 16);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

642

if ((ret = ff_put_wav_header(s, pb, track->par, 0)) < 0)

avformat/movenc: Check ff_put_wav_header() return code

May 10, 2014

643

return ret;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

644

return update_size(pb, pos);

In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime suppor…

Jan 20, 2011

645

}

646

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

647

static int mov_write_wfex_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)

movenc: Support muxing wmapro in ismv/isma

Jan 23, 2012

648

{

avformat/movenc: Check ff_put_wav_header() return code

May 10, 2014

649

int ret;

movenc: Support muxing wmapro in ismv/isma

Jan 23, 2012

650

int64_t pos = avio_tell(pb);

651

avio_wb32(pb, 0);

652

ffio_wfourcc(pb, "wfex");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

653

    if ((ret = ff_put_wav_header(s, pb, track->st->codecpar, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX)) < 0)

avformat/movenc: Check ff_put_wav_header() return code

May 10, 2014

654

return ret;

movenc: Support muxing wmapro in ismv/isma

Jan 23, 2012

655

return update_size(pb, pos);

656

}

657

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

658

static int mov_write_chan_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)

mov: add support for reading and writing the 'chan' tag

Dec 3, 2011

659

{

660

uint32_t layout_tag, bitmap;

661

int64_t pos = avio_tell(pb);

662

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

663

layout_tag = ff_mov_get_channel_layout_tag(track->par->codec_id,

664

track->par->channel_layout,

mov: add support for reading and writing the 'chan' tag

Dec 3, 2011

665

&bitmap);

666

if (!layout_tag) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

667

av_log(s, AV_LOG_WARNING, "not writing 'chan' tag due to "

mov: add support for reading and writing the 'chan' tag

Dec 3, 2011

668

"lack of channel information\n");

669

return 0;

670

}

671

avformat/movenc: dont mark multichannel as mono tracks as containing …

Jul 14, 2014

672

if (track->multichannel_as_mono)

673

return 0;

674

mov: add support for reading and writing the 'chan' tag

Dec 3, 2011

675

avio_wb32(pb, 0); // Size

676

ffio_wfourcc(pb, "chan"); // Type

677

avio_w8(pb, 0); // Version

678

avio_wb24(pb, 0); // Flags

679

avio_wb32(pb, layout_tag); // mChannelLayoutTag

680

avio_wb32(pb, bitmap); // mChannelBitmap

681

avio_wb32(pb, 0); // mNumberChannelDescriptions

682

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

683

return update_size(pb, pos);

mov: add support for reading and writing the 'chan' tag

Dec 3, 2011

684

}

685

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

686

static int mov_write_wave_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

687

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

688

int64_t pos = avio_tell(pb);

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

689

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

690

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

691

ffio_wfourcc(pb, "wave");

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

692

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

693

if (track->par->codec_id != AV_CODEC_ID_QDM2) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

694

avio_wb32(pb, 12); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

695

ffio_wfourcc(pb, "frma");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

696

avio_wl32(pb, track->tag);

movenv: fix remuxing of qdm2

Aug 5, 2012

697

}

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

698

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

699

if (track->par->codec_id == AV_CODEC_ID_AAC) {

fix aac in mov for ipod

Jun 19, 2006

700

/* useless atom needed by mplayer, ipod, not needed by quicktime */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

701

avio_wb32(pb, 12); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

702

ffio_wfourcc(pb, "mp4a");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

703

avio_wb32(pb, 0);

add pcm 24/32 le/be support

May 13, 2006

704

mov_write_esds_tag(pb, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

705

} else if (mov_pcm_le_gt16(track->par->codec_id)) {

movenc.c: Add support for >16bit BE flavours

Oct 2, 2012

706

mov_write_enda_tag(pb);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

707

} else if (mov_pcm_be_gt16(track->par->codec_id)) {

movenc.c: Add support for >16bit BE flavours

Oct 2, 2012

708

mov_write_enda_tag_be(pb);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

709

} else if (track->par->codec_id == AV_CODEC_ID_AMR_NB) {

simplify and write correct values conforming to specs

Jul 6, 2006

710

mov_write_amr_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

711

} else if (track->par->codec_id == AV_CODEC_ID_AC3) {

ac3 muxing support in mov/mp4/m4v

Sep 3, 2008

712

mov_write_ac3_tag(pb, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

713

} else if (track->par->codec_id == AV_CODEC_ID_EAC3) {

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

714

mov_write_eac3_tag(pb, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

715

} else if (track->par->codec_id == AV_CODEC_ID_ALAC ||

716

track->par->codec_id == AV_CODEC_ID_QDM2) {

support for alac in .mov

Apr 24, 2008

717

mov_write_extradata_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

718

} else if (track->par->codec_id == AV_CODEC_ID_ADPCM_MS ||

719

track->par->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) {

720

mov_write_ms_tag(s, pb, track);

add pcm 24/32 le/be support

May 13, 2006

721

}

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

722

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

723

avio_wb32(pb, 8); /* size */

724

avio_wb32(pb, 0); /* null tag */

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

725

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

726

return update_size(pb, pos);

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

727

}

728

movenc: Support muxing VC1

Jan 21, 2012

729

static int mov_write_dvc1_structs(MOVTrack *track, uint8_t *buf)

730

{

731

uint8_t *unescaped;

732

const uint8_t *start, *next, *end = track->vos_data + track->vos_len;

733

int unescaped_size, seq_found = 0;

734

int level = 0, interlace = 0;

735

int packet_seq = track->vc1_info.packet_seq;

736

int packet_entry = track->vc1_info.packet_entry;

737

int slices = track->vc1_info.slices;

738

PutBitContext pbc;

739

740

if (track->start_dts == AV_NOPTS_VALUE) {

741

/* No packets written yet, vc1_info isn't authoritative yet. */

movenc: Get rid of a hack for updating the dvc1 atom

Dec 29, 2014

742

/* Assume inline sequence and entry headers. */

movenc: Support muxing VC1

Jan 21, 2012

743

packet_seq = packet_entry = 1;

movenc: Get rid of a hack for updating the dvc1 atom

Dec 29, 2014

744

av_log(NULL, AV_LOG_WARNING,

745

"moov atom written before any packets, unable to write correct "

746

"dvc1 atom. Set the delay_moov flag to fix this.\n");

movenc: Support muxing VC1

Jan 21, 2012

747

}

748

lavc: Consistently prefix input buffer defines

Jun 29, 2015

749

unescaped = av_mallocz(track->vos_len + AV_INPUT_BUFFER_PADDING_SIZE);

movenc: Support muxing VC1

Jan 21, 2012

750

if (!unescaped)

751

return AVERROR(ENOMEM);

752

start = find_next_marker(track->vos_data, end);

753

for (next = start; next < end; start = next) {

754

GetBitContext gb;

755

int size;

756

next = find_next_marker(start + 4, end);

757

size = next - start - 4;

758

if (size <= 0)

759

continue;

760

unescaped_size = vc1_unescape_buffer(start + 4, size, unescaped);

761

init_get_bits(&gb, unescaped, 8 * unescaped_size);

762

if (AV_RB32(start) == VC1_CODE_SEQHDR) {

763

int profile = get_bits(&gb, 2);

764

if (profile != PROFILE_ADVANCED) {

765

av_free(unescaped);

766

return AVERROR(ENOSYS);

767

}

768

seq_found = 1;

769

level = get_bits(&gb, 3);

770

/* chromaformat, frmrtq_postproc, bitrtq_postproc, postprocflag,

771

* width, height */

772

skip_bits_long(&gb, 2 + 3 + 5 + 1 + 2*12);

773

skip_bits(&gb, 1); /* broadcast */

774

interlace = get_bits1(&gb);

775

skip_bits(&gb, 4); /* tfcntrflag, finterpflag, reserved, psf */

776

}

777

}

778

if (!seq_found) {

779

av_free(unescaped);

780

return AVERROR(ENOSYS);

781

}

782

783

init_put_bits(&pbc, buf, 7);

784

/* VC1DecSpecStruc */

785

put_bits(&pbc, 4, 12); /* profile - advanced */

786

put_bits(&pbc, 3, level);

787

put_bits(&pbc, 1, 0); /* reserved */

788

/* VC1AdvDecSpecStruc */

789

put_bits(&pbc, 3, level);

790

put_bits(&pbc, 1, 0); /* cbr */

791

put_bits(&pbc, 6, 0); /* reserved */

792

put_bits(&pbc, 1, !interlace); /* no interlace */

793

put_bits(&pbc, 1, !packet_seq); /* no multiple seq */

794

put_bits(&pbc, 1, !packet_entry); /* no multiple entry */

795

put_bits(&pbc, 1, !slices); /* no slice code */

796

put_bits(&pbc, 1, 0); /* no bframe */

797

put_bits(&pbc, 1, 0); /* reserved */

movenc: write avg_frame_rate as the framerate, not the codec timebase

May 18, 2014

798

799

/* framerate */

800

if (track->st->avg_frame_rate.num > 0 && track->st->avg_frame_rate.den > 0)

801

        put_bits32(&pbc, track->st->avg_frame_rate.num / track->st->avg_frame_rate.den);

802

else

803

put_bits32(&pbc, 0xffffffff);

804

movenc: Support muxing VC1

Jan 21, 2012

805

flush_put_bits(&pbc);

806

807

av_free(unescaped);

808

809

return 0;

810

}

811

812

static int mov_write_dvc1_tag(AVIOContext *pb, MOVTrack *track)

813

{

814

uint8_t buf[7] = { 0 };

815

int ret;

816

817

if ((ret = mov_write_dvc1_structs(track, buf)) < 0)

818

return ret;

819

820

avio_wb32(pb, track->vos_len + 8 + sizeof(buf));

821

ffio_wfourcc(pb, "dvc1");

822

avio_write(pb, buf, sizeof(buf));

823

avio_write(pb, track->vos_data, track->vos_len);

824

825

return 0;

826

}

827

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

828

static int mov_write_glbl_tag(AVIOContext *pb, MOVTrack *track)

use generic 'glbl' atom if extradata is present but no specific metho…

Dec 19, 2007

829

{

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

830

avio_wb32(pb, track->vos_len + 8);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

831

ffio_wfourcc(pb, "glbl");

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

832

avio_write(pb, track->vos_data, track->vos_len);

833

return 8 + track->vos_len;

use generic 'glbl' atom if extradata is present but no specific metho…

Dec 19, 2007

834

}

835

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

836

/**

837

* Compute flags for 'lpcm' tag.

838

* See CoreAudioTypes and AudioStreamBasicDescription at Apple.

839

*/

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

840

static int mov_get_lpcm_flags(enum AVCodecID codec_id)

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

841

{

842

switch (codec_id) {

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

843

case AV_CODEC_ID_PCM_F32BE:

844

case AV_CODEC_ID_PCM_F64BE:

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

845

return 11;

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

846

case AV_CODEC_ID_PCM_F32LE:

847

case AV_CODEC_ID_PCM_F64LE:

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

848

return 9;

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

849

case AV_CODEC_ID_PCM_U8:

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

850

return 10;

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

851

case AV_CODEC_ID_PCM_S16BE:

852

case AV_CODEC_ID_PCM_S24BE:

853

case AV_CODEC_ID_PCM_S32BE:

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

854

return 14;

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

855

case AV_CODEC_ID_PCM_S8:

856

case AV_CODEC_ID_PCM_S16LE:

857

case AV_CODEC_ID_PCM_S24LE:

858

case AV_CODEC_ID_PCM_S32LE:

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

859

return 12;

860

default:

861

return 0;

862

}

863

}

864

movenc: factorize calculation of cluster duration into a separate fun…

Feb 26, 2012

865

static int get_cluster_duration(MOVTrack *track, int cluster_idx)

866

{

867

int64_t next_dts;

868

869

if (cluster_idx >= track->entry)

870

return 0;

871

872

if (cluster_idx + 1 == track->entry)

873

next_dts = track->track_duration + track->start_dts;

874

else

875

next_dts = track->cluster[cluster_idx + 1].dts;

876

avformat/movenc: assert that get_cluster_duration() value is valid

Feb 21, 2014

877

next_dts -= track->cluster[cluster_idx].dts;

878

879

av_assert0(next_dts >= 0);

880

av_assert0(next_dts <= INT_MAX);

881

882

return next_dts;

movenc: factorize calculation of cluster duration into a separate fun…

Feb 26, 2012

883

}

884

movenc: use timestamps instead of frame_size for samples-per-packet

Feb 26, 2012

885

static int get_samples_per_packet(MOVTrack *track)

886

{

887

int i, first_duration;

888

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

889

// return track->par->frame_size;

Merge remote-tracking branch 'qatar/master'

Feb 28, 2012

890

movenc: use timestamps instead of frame_size for samples-per-packet

Feb 26, 2012

891

/* use 1 for raw PCM */

892

if (!track->audio_vbr)

893

return 1;

894

895

/* check to see if duration is constant for all clusters */

896

if (!track->entry)

897

return 0;

898

first_duration = get_cluster_duration(track, 0);

899

for (i = 1; i < track->entry; i++) {

900

if (get_cluster_duration(track, i) != first_duration)

901

return 0;

902

}

903

return first_duration;

904

}

905

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

906

static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext *mov, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

907

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

908

int64_t pos = avio_tell(pb);

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

909

int version = 0;

910

uint32_t tag = track->tag;

911

912

if (track->mode == MODE_MOV) {

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

913

if (track->timescale > UINT16_MAX) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

914

if (mov_get_lpcm_flags(track->par->codec_id))

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

915

tag = AV_RL32("lpcm");

916

version = 2;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

917

} else if (track->audio_vbr || mov_pcm_le_gt16(track->par->codec_id) ||

918

mov_pcm_be_gt16(track->par->codec_id) ||

919

track->par->codec_id == AV_CODEC_ID_ADPCM_MS ||

920

track->par->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV ||

921

track->par->codec_id == AV_CODEC_ID_QDM2) {

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

922

version = 1;

923

}

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

924

}

COSMETICS: Remove all trailing whitespace.

Dec 17, 2005

925

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

926

avio_wb32(pb, 0); /* size */

movenc: support cenc (common encryption)

Dec 7, 2015

927

if (mov->encryption_scheme != MOV_ENC_NONE) {

928

ffio_wfourcc(pb, "enca");

929

} else {

930

avio_wl32(pb, tag); // store it byteswapped

931

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

932

avio_wb32(pb, 0); /* Reserved */

933

avio_wb16(pb, 0); /* Reserved */

934

avio_wb16(pb, 1); /* Data-reference index, XXX == 1 */

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

935

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

936

/* SoundDescription */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

937

avio_wb16(pb, version); /* Version */

938

avio_wb16(pb, 0); /* Revision level */

939

avio_wb32(pb, 0); /* Reserved */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

940

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

941

if (version == 2) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

942

avio_wb16(pb, 3);

943

avio_wb16(pb, 16);

944

avio_wb16(pb, 0xfffe);

945

avio_wb16(pb, 0);

946

avio_wb32(pb, 0x00010000);

947

avio_wb32(pb, 72);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

948

avio_wb64(pb, av_double2int(track->par->sample_rate));

949

avio_wb32(pb, track->par->channels);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

950

avio_wb32(pb, 0x7F000000);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

951

avio_wb32(pb, av_get_bits_per_sample(track->par->codec_id));

952

avio_wb32(pb, mov_get_lpcm_flags(track->par->codec_id));

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

953

avio_wb32(pb, track->sample_size);

movenc: use timestamps instead of frame_size for samples-per-packet

Feb 26, 2012

954

avio_wb32(pb, get_samples_per_packet(track));

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

955

} else {

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

956

if (track->mode == MODE_MOV) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

957

avio_wb16(pb, track->par->channels);

958

if (track->par->codec_id == AV_CODEC_ID_PCM_U8 ||

959

track->par->codec_id == AV_CODEC_ID_PCM_S8)

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

960

avio_wb16(pb, 8); /* bits per sample */

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

961

else if (track->par->codec_id == AV_CODEC_ID_ADPCM_G726)

962

avio_wb16(pb, track->par->bits_per_coded_sample);

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

963

else

964

avio_wb16(pb, 16);

965

avio_wb16(pb, track->audio_vbr ? -2 : 0); /* compression ID */

966

} else { /* reserved for mp4/3gp */

967

avio_wb16(pb, 2);

968

avio_wb16(pb, 16);

969

avio_wb16(pb, 0);

970

}

AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)

Jul 28, 2004

971

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

972

avio_wb16(pb, 0); /* packet size (= 0) */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

973

avio_wb16(pb, track->par->sample_rate <= UINT16_MAX ?

974

track->par->sample_rate : 0);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

975

avio_wb16(pb, 0); /* Reserved */

support sample rates > INT16_MAX in mov using stsd v2

Nov 29, 2009

976

}

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

977

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

978

if (version == 1) { /* SoundDescription V1 extended info */

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

979

if (mov_pcm_le_gt16(track->par->codec_id) ||

980

mov_pcm_be_gt16(track->par->codec_id))

movenc.c: Force correct value for "Samples per packet" for pcm audio

Oct 5, 2012

981

avio_wb32(pb, 1); /* must be 1 for uncompressed formats */

982

else

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

983

avio_wb32(pb, track->par->frame_size); /* Samples per packet */

984

        avio_wb32(pb, track->sample_size / track->par->channels); /* Bytes per packet */

Merge remote-tracking branch 'qatar/master'

Jan 31, 2012

985

avio_wb32(pb, track->sample_size); /* Bytes per frame */

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

986

avio_wb32(pb, 2); /* Bytes per sample */

987

}

988

movenc: K&R formatting cosmetics

Jul 7, 2013

989

if (track->mode == MODE_MOV &&

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

990

(track->par->codec_id == AV_CODEC_ID_AAC ||

991

track->par->codec_id == AV_CODEC_ID_AC3 ||

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

992

track->par->codec_id == AV_CODEC_ID_EAC3 ||

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

993

track->par->codec_id == AV_CODEC_ID_AMR_NB ||

994

track->par->codec_id == AV_CODEC_ID_ALAC ||

995

track->par->codec_id == AV_CODEC_ID_ADPCM_MS ||

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

996

track->par->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV ||

997

track->par->codec_id == AV_CODEC_ID_QDM2 ||

998

(mov_pcm_le_gt16(track->par->codec_id) && version==1) ||

999

(mov_pcm_be_gt16(track->par->codec_id) && version==1)))

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1000

mov_write_wave_tag(s, pb, track);

movenc: K&R formatting cosmetics

Jul 7, 2013

1001

else if (track->tag == MKTAG('m','p','4','a'))

fix AMR muxing in mov

May 13, 2006

1002

mov_write_esds_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1003

else if (track->par->codec_id == AV_CODEC_ID_AMR_NB)

simplify and write correct values conforming to specs

Jul 6, 2006

1004

mov_write_amr_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1005

else if (track->par->codec_id == AV_CODEC_ID_AC3)

actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr

Sep 4, 2008

1006

mov_write_ac3_tag(pb, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1007

else if (track->par->codec_id == AV_CODEC_ID_EAC3)

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

1008

mov_write_eac3_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1009

else if (track->par->codec_id == AV_CODEC_ID_ALAC)

support alac in ipod m4a format, tested on quicktime

Jun 11, 2008

1010

mov_write_extradata_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1011

else if (track->par->codec_id == AV_CODEC_ID_WMAPRO)

1012

mov_write_wfex_tag(s, pb, track);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1013

else if (track->vos_len > 0)

use generic 'glbl' atom if extradata is present but no specific metho…

Dec 19, 2007

1014

mov_write_glbl_tag(pb, track);

fix AMR muxing in mov

May 13, 2006

1015

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1016

if (track->mode == MODE_MOV && track->par->codec_type == AVMEDIA_TYPE_AUDIO)

1017

mov_write_chan_tag(s, pb, track);

movenc: Write chan atom for all audio tracks in mov mode movies.

May 31, 2012

1018

movenc: support cenc (common encryption)

Dec 7, 2015

1019

if (mov->encryption_scheme != MOV_ENC_NONE) {

1020

ff_mov_cenc_write_sinf_tag(track, pb, mov->encryption_kid);

1021

}

1022

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1023

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1024

}

1025

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1026

static int mov_write_d263_tag(AVIOContext *pb)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1027

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1028

avio_wb32(pb, 0xf); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1029

ffio_wfourcc(pb, "d263");

1030

ffio_wfourcc(pb, "FFMP");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1031

avio_w8(pb, 0); /* decoder version */

detailed infos about d263 atom

Aug 7, 2006

1032

/* FIXME use AVCodecContext level/profile, when encoder will set values */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1033

avio_w8(pb, 0xa); /* level */

1034

avio_w8(pb, 0); /* profile */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1035

return 0xf;

1036

}

1037

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1038

static int mov_write_avcc_tag(AVIOContext *pb, MOVTrack *track)

extract isom_write_avcc into a function

Jan 11, 2008

1039

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

1040

int64_t pos = avio_tell(pb);

extract isom_write_avcc into a function

Jan 11, 2008

1041

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1042

avio_wb32(pb, 0);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1043

ffio_wfourcc(pb, "avcC");

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1044

ff_isom_write_avcc(pb, track->vos_data, track->vos_len);

1045

return update_size(pb, pos);

do nal reformating when muxing H264, create avcc atom

Mar 11, 2006

1046

}

1047

Add experimental support for vp9 in iso-bmff

Jun 15, 2016

1048

static int mov_write_vpcc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)

1049

{

1050

int64_t pos = avio_tell(pb);

1051

1052

avio_wb32(pb, 0);

1053

ffio_wfourcc(pb, "vpcC");

1054

avio_wb32(pb, 0); /* version & flags */

1055

ff_isom_write_vpcc(s, pb, track->par);

1056

return update_size(pb, pos);

1057

}

1058

movenc: write hvcC tag for HEVC.

Mar 3, 2014

1059

static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track)

1060

{

1061

int64_t pos = avio_tell(pb);

1062

1063

avio_wb32(pb, 0);

1064

ffio_wfourcc(pb, "hvcC");

1065

ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0);

1066

return update_size(pb, pos);

1067

}

1068

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1069

/* also used by all avid codecs (dv, imx, meridien) and their variants */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1070

static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track)

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1071

{

1072

int i;

avformat/movenc: Fix writing ACLR atoms for DNxHD

Feb 24, 2015

1073

int interlaced;

1074

int cid;

lavf/movenc: Put correct display aspect ratio in ARES atom.

Sep 29, 2016

1075

int display_width = track->par->width;

avformat/movenc: Fix writing ACLR atoms for DNxHD

Feb 24, 2015

1076

1077

if (track->vos_data && track->vos_len > 0x29) {

avcodec/dnxhddata: move avpriv_dnxhd_parse_header_prefix to a header

Jul 25, 2016

1078

if (ff_dnxhd_parse_header_prefix(track->vos_data) != 0) {

avformat/movenc: Fix writing ACLR atoms for DNxHD

Feb 24, 2015

1079

/* looks like a DNxHD bit stream */

1080

interlaced = (track->vos_data[5] & 2);

1081

cid = AV_RB32(track->vos_data + 0x28);

1082

} else {

1083

            av_log(NULL, AV_LOG_WARNING, "Could not locate DNxHD bit stream in vos_data\n");

1084

return 0;

1085

}

1086

} else {

1087

        av_log(NULL, AV_LOG_WARNING, "Could not locate DNxHD bit stream, vos_data too small\n");

1088

return 0;

1089

}

1090

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1091

avio_wb32(pb, 24); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1092

ffio_wfourcc(pb, "ACLR");

1093

ffio_wfourcc(pb, "ACLR");

1094

ffio_wfourcc(pb, "0001");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1095

if (track->par->color_range == AVCOL_RANGE_MPEG || /* Legal range (16-235) */

1096

track->par->color_range == AVCOL_RANGE_UNSPECIFIED) {

avformat/movenc: respect color_range when encoding dnxhd.

Jul 8, 2014

1097

avio_wb32(pb, 1); /* Corresponds to 709 in official encoder */

1098

} else { /* Full range (0-255) */

1099

avio_wb32(pb, 2); /* Corresponds to RGB in official encoder */

1100

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1101

avio_wb32(pb, 0); /* unknown */

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1102

libavformat/movenc: add dnxhr compatibility for apple players

Jul 22, 2016

1103

if (track->tag == MKTAG('A','V','d','h')) {

1104

avio_wb32(pb, 32);

1105

ffio_wfourcc(pb, "ADHR");

1106

ffio_wfourcc(pb, "0001");

1107

avio_wb32(pb, cid);

1108

avio_wb32(pb, 0); /* unknown */

1109

avio_wb32(pb, 1); /* unknown */

1110

avio_wb32(pb, 0); /* unknown */

1111

avio_wb32(pb, 0); /* unknown */

1112

return 0;

1113

}

1114

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1115

avio_wb32(pb, 24); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1116

ffio_wfourcc(pb, "APRG");

1117

ffio_wfourcc(pb, "APRG");

1118

ffio_wfourcc(pb, "0001");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1119

avio_wb32(pb, 1); /* unknown */

1120

avio_wb32(pb, 0); /* unknown */

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1121

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1122

avio_wb32(pb, 120); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1123

ffio_wfourcc(pb, "ARES");

1124

ffio_wfourcc(pb, "ARES");

1125

ffio_wfourcc(pb, "0001");

avformat/movenc: Fix writing ACLR atoms for DNxHD

Feb 24, 2015

1126

avio_wb32(pb, cid); /* dnxhd cid, some id ? */

lavf/movenc: Put correct display aspect ratio in ARES atom.

Sep 29, 2016

1127

if ( track->par->sample_aspect_ratio.num > 0

1128

&& track->par->sample_aspect_ratio.den > 0)

1129

        display_width = display_width * track->par->sample_aspect_ratio.num / track->par->sample_aspect_ratio.den;

1130

avio_wb32(pb, display_width);

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1131

/* values below are based on samples created with quicktime and avid codecs */

avformat/movenc: Fix writing ACLR atoms for DNxHD

Feb 24, 2015

1132

if (interlaced) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1133

avio_wb32(pb, track->par->height / 2);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1134

avio_wb32(pb, 2); /* unknown */

1135

avio_wb32(pb, 0); /* unknown */

1136

avio_wb32(pb, 4); /* unknown */

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1137

} else {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1138

avio_wb32(pb, track->par->height);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1139

avio_wb32(pb, 1); /* unknown */

1140

avio_wb32(pb, 0); /* unknown */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1141

if (track->par->height == 1080)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1142

avio_wb32(pb, 5); /* unknown */

fix dnxhd 720p in mov for quicktime player

Dec 3, 2007

1143

else

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1144

avio_wb32(pb, 6); /* unknown */

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1145

}

1146

/* padding */

1147

for (i = 0; i < 10; i++)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1148

avio_wb64(pb, 0);

DNxHD (SMPTE VC-3) encoder

Oct 8, 2007

1149

1150

return 0;

1151

}

1152

Handle r10k endianess atom DpxE.

Jan 11, 2015

1153

static int mov_write_dpxe_tag(AVIOContext *pb, MOVTrack *track)

1154

{

1155

avio_wb32(pb, 12);

1156

ffio_wfourcc(pb, "DpxE");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1157

if (track->par->extradata_size >= 12 &&

1158

!memcmp(&track->par->extradata[4], "DpxE", 4)) {

1159

avio_wb32(pb, track->par->extradata[11]);

Handle r10k endianess atom DpxE.

Jan 11, 2015

1160

} else {

1161

avio_wb32(pb, 1);

1162

}

1163

return 0;

1164

}

1165

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1166

static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track)

correct computing of DV fourcc in mov muxer

Mar 8, 2006

1167

{

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1168

int tag = track->par->codec_tag;

cosmetics, reindent, add empty lines

Apr 7, 2009

1169

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1170

if (!ff_codec_get_tag(ff_mp4_obj_type, track->par->codec_id))

cosmetics, reindent, add empty lines

Apr 7, 2009

1171

return 0;

1172

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1173

    if      (track->par->codec_id == AV_CODEC_ID_H264)      tag = MKTAG('a','v','c','1');

1174

    else if (track->par->codec_id == AV_CODEC_ID_HEVC)      tag = MKTAG('h','e','v','1');

Add experimental support for vp9 in iso-bmff

Jun 15, 2016

1175

    else if (track->par->codec_id == AV_CODEC_ID_VP9)       tag = MKTAG('v','p','0','9');

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1176

    else if (track->par->codec_id == AV_CODEC_ID_AC3)       tag = MKTAG('a','c','-','3');

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1177

    else if (track->par->codec_id == AV_CODEC_ID_EAC3)      tag = MKTAG('e','c','-','3');

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1178

    else if (track->par->codec_id == AV_CODEC_ID_DIRAC)     tag = MKTAG('d','r','a','c');

1179

    else if (track->par->codec_id == AV_CODEC_ID_MOV_TEXT)  tag = MKTAG('t','x','3','g');

1180

    else if (track->par->codec_id == AV_CODEC_ID_VC1)       tag = MKTAG('v','c','-','1');

1181

    else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO)  tag = MKTAG('m','p','4','v');

1182

    else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO)  tag = MKTAG('m','p','4','a');

1183

    else if (track->par->codec_id == AV_CODEC_ID_DVD_SUBTITLE)  tag = MKTAG('m','p','4','s');

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1184

1185

return tag;

1186

}

1187

move codec tag tables near corresponding code

Apr 7, 2009

1188

static const AVCodecTag codec_ipod_tags[] = {

movenc: K&R formatting cosmetics

Jul 7, 2013

1189

{ AV_CODEC_ID_H264, MKTAG('a','v','c','1') },

1190

{ AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') },

1191

{ AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },

1192

{ AV_CODEC_ID_ALAC, MKTAG('a','l','a','c') },

1193

{ AV_CODEC_ID_AC3, MKTAG('a','c','-','3') },

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

1194

{ AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') },

1195

{ AV_CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') },

1196

{ AV_CODEC_ID_NONE, 0 },

move codec tag tables near corresponding code

Apr 7, 2009

1197

};

1198

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1199

static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track)

1200

{

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1201

int tag = track->par->codec_tag;

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1202

comment the ipod subtitle check

Apr 7, 2009

1203

// keep original tag for subs, ipod supports both formats

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1204

if (!(track->par->codec_type == AVMEDIA_TYPE_SUBTITLE &&

movenc: K&R formatting cosmetics

Jul 7, 2013

1205

(tag == MKTAG('t', 'x', '3', 'g') ||

1206

tag == MKTAG('t', 'e', 'x', 't'))))

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1207

tag = ff_codec_get_tag(codec_ipod_tags, track->par->codec_id);

cosmetics, add empty line and remove useless braces

Apr 7, 2009

1208

avformat/movenc: add m4b to list of ipod playable files

Jul 30, 2014

1209

if (!av_match_ext(s->filename, "m4a") &&

1210

!av_match_ext(s->filename, "m4b") &&

1211

!av_match_ext(s->filename, "m4v"))

1212

av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a, .m4v nor .m4b "

cosmetics, reindent, add empty lines

Apr 7, 2009

1213

"Quicktime/Ipod might not play the file\n");

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1214

1215

return tag;

1216

}

1217

1218

static int mov_get_dv_codec_tag(AVFormatContext *s, MOVTrack *track)

1219

{

1220

int tag;

1221

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1222

if (track->par->width == 720) { /* SD */

1223

if (track->par->height == 480) { /* NTSC */

1224

if (track->par->format == AV_PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n');

movenc: K&R formatting cosmetics

Jul 7, 2013

1225

else tag = MKTAG('d','v','c',' ');

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1226

       }else if (track->par->format == AV_PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p');

1227

        else if (track->par->format == AV_PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p');

movenc: K&R formatting cosmetics

Jul 7, 2013

1228

        else                                                tag = MKTAG('d','v','p','p');

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1229

} else if (track->par->height == 720) { /* HD 720 line */

lavf: switch to AVStream.time_base as the hint for the muxer timebase

May 18, 2014

1230

        if  (track->st->time_base.den == 50)                tag = MKTAG('d','v','h','q');

movenc: K&R formatting cosmetics

Jul 7, 2013

1231

        else                                                tag = MKTAG('d','v','h','p');

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1232

} else if (track->par->height == 1080) { /* HD 1080 line */

lavf: switch to AVStream.time_base as the hint for the muxer timebase

May 18, 2014

1233

        if  (track->st->time_base.den == 25)                tag = MKTAG('d','v','h','5');

movenc: K&R formatting cosmetics

Jul 7, 2013

1234

        else                                                tag = MKTAG('d','v','h','6');

libavformat/movenc: add {} to complex ifs

Oct 21, 2012

1235

} else {

movenc: use correct tag for dvcpro hd

Mar 1, 2011

1236

av_log(s, AV_LOG_ERROR, "unsupported height for dv codec\n");

1237

return 0;

1238

}

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1239

1240

return tag;

1241

}

1242

avformat/movenc: factor out find_fps()

Oct 7, 2013

1243

static AVRational find_fps(AVFormatContext *s, AVStream *st)

1244

{

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1245

AVRational rate = st->avg_frame_rate;

1246

1247

#if FF_API_LAVF_AVCTX

1248

FF_DISABLE_DEPRECATION_WARNINGS

1249

rate = av_inv_q(st->codec->time_base);

avformat/movenc: factor out find_fps()

Oct 7, 2013

1250

if (av_timecode_check_frame_rate(rate) < 0) {

1251

av_log(s, AV_LOG_DEBUG, "timecode: tbc=%d/%d invalid, fallback on %d/%d\n",

1252

rate.num, rate.den, st->avg_frame_rate.num, st->avg_frame_rate.den);

1253

rate = st->avg_frame_rate;

1254

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1255

FF_ENABLE_DEPRECATION_WARNINGS

1256

#endif

avformat/movenc: factor out find_fps()

Oct 7, 2013

1257

1258

return rate;

1259

}

1260

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1261

static int mov_get_mpeg2_xdcam_codec_tag(AVFormatContext *s, MOVTrack *track)

1262

{

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1263

int tag = track->par->codec_tag;

1264

int interlaced = track->par->field_order > AV_FIELD_PROGRESSIVE;

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1265

AVStream *st = track->st;

1266

int rate = av_q2d(find_fps(s, st));

1267

mvformat/movenc: fix IMX

Jan 27, 2014

1268

if (!tag)

1269

tag = MKTAG('m', '2', 'v', '1'); //fallback tag

1270

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1271

if (track->par->format == AV_PIX_FMT_YUV420P) {

1272

if (track->par->width == 1280 && track->par->height == 720) {

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1273

if (!interlaced) {

1274

if (rate == 24) tag = MKTAG('x','d','v','4');

1275

else if (rate == 25) tag = MKTAG('x','d','v','5');

1276

else if (rate == 30) tag = MKTAG('x','d','v','1');

1277

else if (rate == 50) tag = MKTAG('x','d','v','a');

1278

else if (rate == 60) tag = MKTAG('x','d','v','9');

1279

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1280

} else if (track->par->width == 1440 && track->par->height == 1080) {

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1281

if (!interlaced) {

1282

if (rate == 24) tag = MKTAG('x','d','v','6');

1283

else if (rate == 25) tag = MKTAG('x','d','v','7');

1284

else if (rate == 30) tag = MKTAG('x','d','v','8');

1285

} else {

1286

if (rate == 25) tag = MKTAG('x','d','v','3');

1287

else if (rate == 30) tag = MKTAG('x','d','v','2');

1288

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1289

} else if (track->par->width == 1920 && track->par->height == 1080) {

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1290

if (!interlaced) {

1291

if (rate == 24) tag = MKTAG('x','d','v','d');

1292

else if (rate == 25) tag = MKTAG('x','d','v','e');

1293

else if (rate == 30) tag = MKTAG('x','d','v','f');

1294

} else {

1295

if (rate == 25) tag = MKTAG('x','d','v','c');

1296

else if (rate == 30) tag = MKTAG('x','d','v','b');

1297

}

1298

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1299

} else if (track->par->format == AV_PIX_FMT_YUV422P) {

1300

if (track->par->width == 1280 && track->par->height == 720) {

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1301

if (!interlaced) {

1302

if (rate == 24) tag = MKTAG('x','d','5','4');

1303

else if (rate == 25) tag = MKTAG('x','d','5','5');

1304

else if (rate == 30) tag = MKTAG('x','d','5','1');

1305

else if (rate == 50) tag = MKTAG('x','d','5','a');

1306

else if (rate == 60) tag = MKTAG('x','d','5','9');

1307

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1308

} else if (track->par->width == 1920 && track->par->height == 1080) {

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1309

if (!interlaced) {

1310

if (rate == 24) tag = MKTAG('x','d','5','d');

1311

else if (rate == 25) tag = MKTAG('x','d','5','e');

1312

else if (rate == 30) tag = MKTAG('x','d','5','f');

1313

} else {

1314

if (rate == 25) tag = MKTAG('x','d','5','c');

1315

else if (rate == 30) tag = MKTAG('x','d','5','b');

1316

}

1317

}

1318

}

1319

1320

return tag;

1321

}

1322

avformat/movenc: AVC Intra support

Sep 27, 2014

1323

static int mov_get_h264_codec_tag(AVFormatContext *s, MOVTrack *track)

1324

{

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1325

int tag = track->par->codec_tag;

1326

int interlaced = track->par->field_order > AV_FIELD_PROGRESSIVE;

avformat/movenc: AVC Intra support

Sep 27, 2014

1327

AVStream *st = track->st;

1328

int rate = av_q2d(find_fps(s, st));

1329

1330

if (!tag)

1331

tag = MKTAG('a', 'v', 'c', 'i'); //fallback tag

1332

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1333

if (track->par->format == AV_PIX_FMT_YUV420P10) {

1334

if (track->par->width == 960 && track->par->height == 720) {

avformat/movenc: AVC Intra support

Sep 27, 2014

1335

if (!interlaced) {

1336

if (rate == 24) tag = MKTAG('a','i','5','p');

1337

else if (rate == 25) tag = MKTAG('a','i','5','q');

1338

else if (rate == 30) tag = MKTAG('a','i','5','p');

1339

else if (rate == 50) tag = MKTAG('a','i','5','q');

1340

else if (rate == 60) tag = MKTAG('a','i','5','p');

1341

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1342

} else if (track->par->width == 1440 && track->par->height == 1080) {

avformat/movenc: AVC Intra support

Sep 27, 2014

1343

if (!interlaced) {

1344

if (rate == 24) tag = MKTAG('a','i','5','3');

1345

else if (rate == 25) tag = MKTAG('a','i','5','2');

1346

else if (rate == 30) tag = MKTAG('a','i','5','3');

1347

} else {

1348

if (rate == 50) tag = MKTAG('a','i','5','5');

1349

else if (rate == 60) tag = MKTAG('a','i','5','6');

1350

}

1351

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1352

} else if (track->par->format == AV_PIX_FMT_YUV422P10) {

1353

if (track->par->width == 1280 && track->par->height == 720) {

avformat/movenc: AVC Intra support

Sep 27, 2014

1354

if (!interlaced) {

1355

if (rate == 24) tag = MKTAG('a','i','1','p');

1356

else if (rate == 25) tag = MKTAG('a','i','1','q');

1357

else if (rate == 30) tag = MKTAG('a','i','1','p');

1358

else if (rate == 50) tag = MKTAG('a','i','1','q');

1359

else if (rate == 60) tag = MKTAG('a','i','1','p');

1360

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1361

} else if (track->par->width == 1920 && track->par->height == 1080) {

avformat/movenc: AVC Intra support

Sep 27, 2014

1362

if (!interlaced) {

1363

if (rate == 24) tag = MKTAG('a','i','1','3');

1364

else if (rate == 25) tag = MKTAG('a','i','1','2');

1365

else if (rate == 30) tag = MKTAG('a','i','1','3');

1366

} else {

1367

if (rate == 25) tag = MKTAG('a','i','1','5');

1368

else if (rate == 50) tag = MKTAG('a','i','1','5');

1369

else if (rate == 60) tag = MKTAG('a','i','1','6');

1370

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1371

} else if ( track->par->width == 4096 && track->par->height == 2160

1372

|| track->par->width == 3840 && track->par->height == 2160

1373

|| track->par->width == 2048 && track->par->height == 1080) {

Support muxing 4k AVC Intra in mov.

Dec 2, 2014

1374

tag = MKTAG('a','i','v','x');

avformat/movenc: AVC Intra support

Sep 27, 2014

1375

}

1376

}

1377

1378

return tag;

1379

}

1380

move codec tag tables near corresponding code

Apr 7, 2009

1381

static const struct {

Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Oct 6, 2012

1382

enum AVPixelFormat pix_fmt;

move codec tag tables near corresponding code

Apr 7, 2009

1383

uint32_t tag;

1384

unsigned bps;

1385

} mov_pix_fmt_tags[] = {

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

Oct 8, 2012

1386

{ AV_PIX_FMT_YUYV422, MKTAG('y','u','v','2'), 0 },

Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Oct 6, 2012

1387

{ AV_PIX_FMT_YUYV422, MKTAG('y','u','v','s'), 0 },

1388

{ AV_PIX_FMT_UYVY422, MKTAG('2','v','u','y'), 0 },

1389

{ AV_PIX_FMT_RGB555BE,MKTAG('r','a','w',' '), 16 },

1390

{ AV_PIX_FMT_RGB555LE,MKTAG('L','5','5','5'), 16 },

1391

{ AV_PIX_FMT_RGB565LE,MKTAG('L','5','6','5'), 16 },

1392

{ AV_PIX_FMT_RGB565BE,MKTAG('B','5','6','5'), 16 },

1393

{ AV_PIX_FMT_GRAY16BE,MKTAG('b','1','6','g'), 16 },

1394

{ AV_PIX_FMT_RGB24, MKTAG('r','a','w',' '), 24 },

1395

{ AV_PIX_FMT_BGR24, MKTAG('2','4','B','G'), 24 },

1396

{ AV_PIX_FMT_ARGB, MKTAG('r','a','w',' '), 32 },

1397

{ AV_PIX_FMT_BGRA, MKTAG('B','G','R','A'), 32 },

1398

{ AV_PIX_FMT_RGBA, MKTAG('R','G','B','A'), 32 },

1399

{ AV_PIX_FMT_ABGR, MKTAG('A','B','G','R'), 32 },

1400

{ AV_PIX_FMT_RGB48BE, MKTAG('b','4','8','r'), 48 },

move codec tag tables near corresponding code

Apr 7, 2009

1401

};

1402

libavformat/movenc: add dnxhr compatibility for apple players

Jul 22, 2016

1403

static int mov_get_dnxhd_codec_tag(AVFormatContext *s, MOVTrack *track)

1404

{

1405

int tag = MKTAG('A','V','d','n');

1406

if (track->par->profile != FF_PROFILE_UNKNOWN &&

1407

track->par->profile != FF_PROFILE_DNXHD)

1408

tag = MKTAG('A','V','d','h');

1409

return tag;

1410

}

1411

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1412

static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track)

1413

{

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1414

int tag = track->par->codec_tag;

cosmetics, reindent, add empty lines

Apr 7, 2009

1415

int i;

Warn if rawvideo and an unreadable pix_fmt are written.

Apr 11, 2014

1416

enum AVPixelFormat pix_fmt;

cosmetics, reindent, add empty lines

Apr 7, 2009

1417

1418

for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); i++) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1419

if (track->par->format == mov_pix_fmt_tags[i].pix_fmt) {

cosmetics, reindent, add empty lines

Apr 7, 2009

1420

tag = mov_pix_fmt_tags[i].tag;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1421

track->par->bits_per_coded_sample = mov_pix_fmt_tags[i].bps;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1422

if (track->par->codec_tag == mov_pix_fmt_tags[i].tag)

movenc: fix regression with yuyv caused by c5f23d

Oct 6, 2012

1423

break;

cosmetics, reindent, add empty lines

Apr 7, 2009

1424

}

1425

}

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1426

Warn if rawvideo and an unreadable pix_fmt are written.

Apr 11, 2014

1427

pix_fmt = avpriv_find_pix_fmt(avpriv_pix_fmt_bps_mov,

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1428

track->par->bits_per_coded_sample);

Warn if rawvideo and an unreadable pix_fmt are written.

Apr 11, 2014

1429

if (tag == MKTAG('r','a','w',' ') &&

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1430

track->par->format != pix_fmt &&

lavf/movenc: Do not print an error when muxing gray8 rawvideo.

Nov 4, 2016

1431

track->par->format != AV_PIX_FMT_GRAY8 &&

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1432

track->par->format != AV_PIX_FMT_NONE)

Warn if rawvideo and an unreadable pix_fmt are written.

Apr 11, 2014

1433

        av_log(s, AV_LOG_ERROR, "%s rawvideo cannot be written to mov, output file will be unreadable\n",

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1434

av_get_pix_fmt_name(track->par->format));

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1435

return tag;

1436

}

1437

1438

static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)

1439

{

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1440

int tag = track->par->codec_tag;

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1441

lavf: use the format context strict_std_compliance instead of the cod…

Jul 5, 2014

1442

if (!tag || (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1443

(track->par->codec_id == AV_CODEC_ID_DVVIDEO ||

1444

track->par->codec_id == AV_CODEC_ID_RAWVIDEO ||

1445

track->par->codec_id == AV_CODEC_ID_H263 ||

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1446

track->par->codec_id == AV_CODEC_ID_H264 ||

libavformat/movenc: add dnxhr compatibility for apple players

Jul 22, 2016

1447

track->par->codec_id == AV_CODEC_ID_DNXHD ||

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1448

track->par->codec_id == AV_CODEC_ID_MPEG2VIDEO ||

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1449

av_get_bits_per_sample(track->par->codec_id)))) { // pcm audio

1450

if (track->par->codec_id == AV_CODEC_ID_DVVIDEO)

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1451

tag = mov_get_dv_codec_tag(s, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1452

else if (track->par->codec_id == AV_CODEC_ID_RAWVIDEO)

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1453

tag = mov_get_rawvideo_codec_tag(s, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1454

else if (track->par->codec_id == AV_CODEC_ID_MPEG2VIDEO)

avformat/movenc: set XDCAM codec tag correctly

Oct 7, 2013

1455

tag = mov_get_mpeg2_xdcam_codec_tag(s, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1456

else if (track->par->codec_id == AV_CODEC_ID_H264)

avformat/movenc: AVC Intra support

Sep 27, 2014

1457

tag = mov_get_h264_codec_tag(s, track);

libavformat/movenc: add dnxhr compatibility for apple players

Jul 22, 2016

1458

else if (track->par->codec_id == AV_CODEC_ID_DNXHD)

1459

tag = mov_get_dnxhd_codec_tag(s, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1460

else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) {

1461

tag = ff_codec_get_tag(ff_codec_movvideo_tags, track->par->codec_id);

cosmetics, reindent

Apr 7, 2009

1462

if (!tag) { // if no mac fcc found, try with Microsoft tags

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1463

tag = ff_codec_get_tag(ff_codec_bmp_tags, track->par->codec_id);

cosmetics, reindent

Apr 7, 2009

1464

if (tag)

movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings

Aug 11, 2011

1465

av_log(s, AV_LOG_WARNING, "Using MS style video codec tag, "

cosmetics, reindent

Apr 7, 2009

1466

"the file may be unplayable!\n");

1467

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1468

} else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) {

1469

tag = ff_codec_get_tag(ff_codec_movaudio_tags, track->par->codec_id);

cosmetics, reindent

Apr 7, 2009

1470

if (!tag) { // if no mac fcc found, try with Microsoft tags

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1471

int ms_tag = ff_codec_get_tag(ff_codec_wav_tags, track->par->codec_id);

cosmetics, reindent

Apr 7, 2009

1472

if (ms_tag) {

1473

tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff));

movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings

Aug 11, 2011

1474

av_log(s, AV_LOG_WARNING, "Using MS style audio codec tag, "

cosmetics, reindent

Apr 7, 2009

1475

"the file may be unplayable!\n");

indentation

Jan 28, 2008

1476

}

cosmetics, reindent

Apr 7, 2009

1477

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1478

} else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE)

1479

tag = ff_codec_get_tag(ff_codec_movsubtitle_tags, track->par->codec_id);

correctly and only set standard stsd fourcc for mp4/3gp

Jan 28, 2008

1480

}

cosmetics, reindent, add empty lines

Apr 7, 2009

1481

correct computing of DV fourcc in mov muxer

Mar 8, 2006

1482

return tag;

1483

}

1484

move codec tag tables near corresponding code

Apr 7, 2009

1485

static const AVCodecTag codec_3gp_tags[] = {

movenc: K&R formatting cosmetics

Jul 7, 2013

1486

{ AV_CODEC_ID_H263, MKTAG('s','2','6','3') },

1487

{ AV_CODEC_ID_H264, MKTAG('a','v','c','1') },

1488

{ AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') },

1489

{ AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },

1490

{ AV_CODEC_ID_AMR_NB, MKTAG('s','a','m','r') },

1491

{ AV_CODEC_ID_AMR_WB, MKTAG('s','a','w','b') },

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

1492

{ AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') },

1493

{ AV_CODEC_ID_NONE, 0 },

move codec tag tables near corresponding code

Apr 7, 2009

1494

};

1495

lavf/movenc: add F4V flavor.

Sep 17, 2012

1496

static const AVCodecTag codec_f4v_tags[] = { // XXX: add GIF/PNG/JPEG?

1497

{ AV_CODEC_ID_MP3, MKTAG('.','m','p','3') },

1498

{ AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },

1499

{ AV_CODEC_ID_H264, MKTAG('a','v','c','1') },

movenc: Add an F4V muxer

Sep 17, 2012

1500

{ AV_CODEC_ID_VP6A, MKTAG('V','P','6','A') },

lavf/movenc: add F4V flavor.

Sep 17, 2012

1501

{ AV_CODEC_ID_VP6F, MKTAG('V','P','6','F') },

1502

{ AV_CODEC_ID_NONE, 0 },

1503

};

1504

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1505

static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)

1506

{

movenc: Remove a dead initialization

Apr 13, 2012

1507

int tag;

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1508

movenc: Support muxing wmapro in ismv/isma

Jan 23, 2012

1509

if (track->mode == MODE_MP4 || track->mode == MODE_PSP)

1510

tag = mp4_get_codec_tag(s, track);

1511

else if (track->mode == MODE_ISM) {

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1512

tag = mp4_get_codec_tag(s, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1513

if (!tag && track->par->codec_id == AV_CODEC_ID_WMAPRO)

movenc: Support muxing wmapro in ismv/isma

Jan 23, 2012

1514

tag = MKTAG('w', 'm', 'a', ' ');

1515

} else if (track->mode == MODE_IPOD)

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1516

tag = ipod_get_codec_tag(s, track);

1517

else if (track->mode & MODE_3GP)

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1518

tag = ff_codec_get_tag(codec_3gp_tags, track->par->codec_id);

movenc: Add an F4V muxer

Sep 17, 2012

1519

else if (track->mode == MODE_F4V)

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1520

tag = ff_codec_get_tag(codec_f4v_tags, track->par->codec_id);

split mov_find_codec_tag in separate per format functions

Apr 7, 2009

1521

else

1522

tag = mov_get_codec_tag(s, track);

1523

1524

return tag;

1525

}

1526

ipod/iphone compatible mp4 muxer

Mar 16, 2008

1527

/** Write uuid atom.

1528

* Needed to make file play in iPods running newest firmware

1529

* goes after avcC atom in moov.trak.mdia.minf.stbl.stsd.avc1

1530

*/

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1531

static int mov_write_uuid_tag_ipod(AVIOContext *pb)

ipod/iphone compatible mp4 muxer

Mar 16, 2008

1532

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1533

avio_wb32(pb, 28);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1534

ffio_wfourcc(pb, "uuid");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1535

avio_wb32(pb, 0x6b6840f2);

1536

avio_wb32(pb, 0x5f244fc5);

1537

avio_wb32(pb, 0xba39a51b);

1538

avio_wb32(pb, 0xcf0323f3);

1539

avio_wb32(pb, 0x0);

ipod/iphone compatible mp4 muxer

Mar 16, 2008

1540

return 28;

1541

}

1542

mov: Don't stick the QuickTime field ordering atom in extradata.

Dec 14, 2011

1543

static const uint16_t fiel_data[] = {

1544

0x0000, 0x0100, 0x0201, 0x0206, 0x0209, 0x020e

1545

};

1546

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1547

static int mov_write_fiel_tag(AVIOContext *pb, MOVTrack *track, int field_order)

mov: Don't stick the QuickTime field ordering atom in extradata.

Dec 14, 2011

1548

{

1549

unsigned mov_field_order = 0;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1550

if (field_order < FF_ARRAY_ELEMS(fiel_data))

1551

mov_field_order = fiel_data[field_order];

mov: Don't stick the QuickTime field ordering atom in extradata.

Dec 14, 2011

1552

else

1553

return 0;

1554

avio_wb32(pb, 10);

1555

ffio_wfourcc(pb, "fiel");

1556

avio_wb16(pb, mov_field_order);

1557

return 10;

1558

}

1559

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1560

static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track)

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

1561

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

1562

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1563

avio_wb32(pb, 0); /* size */

1564

avio_wl32(pb, track->tag); // store it byteswapped

1565

avio_wb32(pb, 0); /* Reserved */

1566

avio_wb16(pb, 0); /* Reserved */

1567

avio_wb16(pb, 1); /* Data-reference index */

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

1568

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1569

if (track->par->codec_id == AV_CODEC_ID_DVD_SUBTITLE)

movenc: Add dvd subtitle support

Mar 18, 2014

1570

mov_write_esds_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1571

else if (track->par->extradata_size)

1572

avio_write(pb, track->par->extradata, track->par->extradata_size);

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

1573

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1574

return update_size(pb, pos);

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

1575

}

1576

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1577

static int mov_write_pasp_tag(AVIOContext *pb, MOVTrack *track)

In mov muxer, write pixel aspect ratio tag in mov files.

Jul 8, 2010

1578

{

1579

AVRational sar;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1580

av_reduce(&sar.num, &sar.den, track->par->sample_aspect_ratio.num,

1581

track->par->sample_aspect_ratio.den, INT_MAX);

In mov muxer, write pixel aspect ratio tag in mov files.

Jul 8, 2010

1582

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1583

avio_wb32(pb, 16);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1584

ffio_wfourcc(pb, "pasp");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1585

avio_wb32(pb, sar.num);

1586

avio_wb32(pb, sar.den);

In mov muxer, write pixel aspect ratio tag in mov files.

Jul 8, 2010

1587

return 16;

1588

}

1589

avformat/movenc: Add support for writing 'gama' atom to QuickTime .mo…

Mar 5, 2015

1590

static int mov_write_gama_tag(AVIOContext *pb, MOVTrack *track, double gamma)

1591

{

1592

uint32_t gama = 0;

1593

if (gamma <= 0.0)

1594

{

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1595

gamma = avpriv_get_gamma_from_trc(track->par->color_trc);

avformat/movenc: Add support for writing 'gama' atom to QuickTime .mo…

Mar 5, 2015

1596

}

1597

av_log(pb, AV_LOG_DEBUG, "gamma value %g\n", gamma);

1598

1599

if (gamma > 1e-6) {

1600

gama = (uint32_t)lrint((double)(1<<16) * gamma);

1601

av_log(pb, AV_LOG_DEBUG, "writing gama value %d\n", gama);

1602

1603

av_assert0(track->mode == MODE_MOV);

1604

avio_wb32(pb, 12);

1605

ffio_wfourcc(pb, "gama");

1606

avio_wb32(pb, gama);

1607

return 12;

1608

}

1609

else {

1610

av_log(pb, AV_LOG_WARNING, "gamma value unknown, unable to write gama atom\n");

1611

}

1612

return 0;

1613

}

1614

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1615

static int mov_write_colr_tag(AVIOContext *pb, MOVTrack *track)

1616

{

movenc: Write 'colr' box correctly for MP4

Feb 26, 2015

1617

    // Ref (MOV): https://developer.apple.com/library/mac/technotes/tn2162/_index.html#//apple_ref/doc/uid/DTS40013070-CH1-TNTAG9

1618

// Ref (MP4): ISO/IEC 14496-12:2012

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1619

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1620

if (track->par->color_primaries == AVCOL_PRI_UNSPECIFIED &&

1621

track->par->color_trc == AVCOL_TRC_UNSPECIFIED &&

1622

track->par->color_space == AVCOL_SPC_UNSPECIFIED) {

1623

if ((track->par->width >= 1920 && track->par->height >= 1080)

1624

|| (track->par->width == 1280 && track->par->height == 720)) {

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1625

av_log(NULL, AV_LOG_WARNING, "color primaries unspecified, assuming bt709\n");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1626

track->par->color_primaries = AVCOL_PRI_BT709;

1627

} else if (track->par->width == 720 && track->height == 576) {

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1628

            av_log(NULL, AV_LOG_WARNING, "color primaries unspecified, assuming bt470bg\n");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1629

track->par->color_primaries = AVCOL_PRI_BT470BG;

1630

} else if (track->par->width == 720 &&

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1631

(track->height == 486 || track->height == 480)) {

1632

            av_log(NULL, AV_LOG_WARNING, "color primaries unspecified, assuming smpte170\n");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1633

track->par->color_primaries = AVCOL_PRI_SMPTE170M;

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1634

} else {

1635

            av_log(NULL, AV_LOG_WARNING, "color primaries unspecified, unable to assume anything\n");

1636

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1637

switch (track->par->color_primaries) {

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1638

case AVCOL_PRI_BT709:

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1639

track->par->color_trc = AVCOL_TRC_BT709;

1640

track->par->color_space = AVCOL_SPC_BT709;

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1641

break;

1642

case AVCOL_PRI_SMPTE170M:

1643

case AVCOL_PRI_BT470BG:

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1644

track->par->color_trc = AVCOL_TRC_BT709;

1645

track->par->color_space = AVCOL_SPC_SMPTE170M;

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1646

break;

1647

}

1648

}

1649

movenc: Write 'colr' box correctly for MP4

Feb 26, 2015

1650

/* We should only ever be called by MOV or MP4. */

1651

av_assert0(track->mode == MODE_MOV || track->mode == MODE_MP4);

1652

1653

avio_wb32(pb, 18 + (track->mode == MODE_MP4));

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1654

ffio_wfourcc(pb, "colr");

movenc: Write 'colr' box correctly for MP4

Feb 26, 2015

1655

if (track->mode == MODE_MP4)

1656

ffio_wfourcc(pb, "nclx");

1657

else

1658

ffio_wfourcc(pb, "nclc");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1659

switch (track->par->color_primaries) {

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1660

case AVCOL_PRI_BT709: avio_wb16(pb, 1); break;

1661

case AVCOL_PRI_SMPTE170M:

1662

case AVCOL_PRI_SMPTE240M: avio_wb16(pb, 6); break;

1663

case AVCOL_PRI_BT470BG: avio_wb16(pb, 5); break;

1664

default: avio_wb16(pb, 2);

1665

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1666

switch (track->par->color_trc) {

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1667

case AVCOL_TRC_BT709: avio_wb16(pb, 1); break;

1668

case AVCOL_TRC_SMPTE170M: avio_wb16(pb, 1); break; // remapped

1669

case AVCOL_TRC_SMPTE240M: avio_wb16(pb, 7); break;

1670

default: avio_wb16(pb, 2);

1671

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1672

switch (track->par->color_space) {

lavf/mov: Use AVCOL_SPC constants when checking color_space.

May 20, 2015

1673

case AVCOL_SPC_BT709: avio_wb16(pb, 1); break;

lavf/mov: Write colour matrix "6" for color_space bt470bg.

May 20, 2015

1674

case AVCOL_SPC_BT470BG:

lavf/mov: Use AVCOL_SPC constants when checking color_space.

May 20, 2015

1675

case AVCOL_SPC_SMPTE170M: avio_wb16(pb, 6); break;

1676

case AVCOL_SPC_SMPTE240M: avio_wb16(pb, 7); break;

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1677

default: avio_wb16(pb, 2);

1678

}

1679

movenc: Write 'colr' box correctly for MP4

Feb 26, 2015

1680

if (track->mode == MODE_MP4) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1681

int full_range = track->par->color_range == AVCOL_RANGE_JPEG;

movenc: Write 'colr' box correctly for MP4

Feb 26, 2015

1682

avio_w8(pb, full_range << 7);

1683

return 19;

1684

} else {

1685

return 18;

1686

}

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1687

}

1688

avformat/movenc: set pretty compressor name for XDCAM

Oct 7, 2013

1689

static void find_compressor(char * compressor_name, int len, MOVTrack *track)

1690

{

movenc: use the "encoder" metadata tag to write stsd Compressorname

Apr 29, 2014

1691

AVDictionaryEntry *encoder;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1692

int xdcam_res = (track->par->width == 1280 && track->par->height == 720)

1693

|| (track->par->width == 1440 && track->par->height == 1080)

1694

|| (track->par->width == 1920 && track->par->height == 1080);

avformat/movenc: set pretty compressor name for XDCAM

Oct 7, 2013

1695

Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'

May 18, 2014

1696

if (track->mode == MODE_MOV &&

1697

(encoder = av_dict_get(track->st->metadata, "encoder", NULL, 0))) {

1698

av_strlcpy(compressor_name, encoder->value, 32);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1699

} else if (track->par->codec_id == AV_CODEC_ID_MPEG2VIDEO && xdcam_res) {

1700

int interlaced = track->par->field_order > AV_FIELD_PROGRESSIVE;

avformat/movenc: set pretty compressor name for XDCAM

Oct 7, 2013

1701

AVStream *st = track->st;

1702

int rate = av_q2d(find_fps(NULL, st));

1703

av_strlcatf(compressor_name, len, "XDCAM");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1704

if (track->par->format == AV_PIX_FMT_YUV422P) {

avformat/movenc: set pretty compressor name for XDCAM

Oct 7, 2013

1705

av_strlcatf(compressor_name, len, " HD422");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1706

} else if(track->par->width == 1440) {

avformat/movenc: set pretty compressor name for XDCAM

Oct 7, 2013

1707

av_strlcatf(compressor_name, len, " HD");

1708

} else

1709

av_strlcatf(compressor_name, len, " EX");

1710

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1711

        av_strlcatf(compressor_name, len, " %d%c", track->par->height, interlaced ? 'i' : 'p');

avformat/movenc: set pretty compressor name for XDCAM

Oct 7, 2013

1712

1713

av_strlcatf(compressor_name, len, "%d", rate * (interlaced + 1));

1714

}

1715

}

1716

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1717

static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1718

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

1719

int64_t pos = avio_tell(pb);

Replace memset(0) by zero initializations.

Jun 6, 2011

1720

char compressor_name[32] = { 0 };

avformat/movenc: Move avid DNxHD padding to the correct spot

Feb 16, 2015

1721

int avid = 0;

support for wider range of codecs

Apr 7, 2004

1722

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1723

avio_wb32(pb, 0); /* size */

movenc: support cenc (common encryption)

Dec 7, 2015

1724

if (mov->encryption_scheme != MOV_ENC_NONE) {

1725

ffio_wfourcc(pb, "encv");

1726

} else {

1727

avio_wl32(pb, track->tag); // store it byteswapped

1728

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1729

avio_wb32(pb, 0); /* Reserved */

1730

avio_wb16(pb, 0); /* Reserved */

1731

avio_wb16(pb, 1); /* Data-reference index */

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

1732

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1733

avio_wb16(pb, 0); /* Codec stream version */

1734

avio_wb16(pb, 0); /* Codec stream revision (=0) */

only set fields for mov, reserved for 3gp, mp4

Aug 7, 2006

1735

if (track->mode == MODE_MOV) {

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1736

ffio_wfourcc(pb, "FFMP"); /* Vendor */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1737

if (track->par->codec_id == AV_CODEC_ID_RAWVIDEO) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1738

avio_wb32(pb, 0); /* Temporal Quality */

1739

avio_wb32(pb, 0x400); /* Spatial Quality = lossless*/

indention

Aug 7, 2006

1740

} else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1741

avio_wb32(pb, 0x200); /* Temporal Quality = normal */

1742

avio_wb32(pb, 0x200); /* Spatial Quality = normal */

indention

Aug 7, 2006

1743

}

only set fields for mov, reserved for 3gp, mp4

Aug 7, 2006

1744

} else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1745

avio_wb32(pb, 0); /* Reserved */

1746

avio_wb32(pb, 0); /* Reserved */

1747

avio_wb32(pb, 0); /* Reserved */

only set fields for mov, reserved for 3gp, mp4

Aug 7, 2006

1748

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1749

avio_wb16(pb, track->par->width); /* Video width */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1750

avio_wb16(pb, track->height); /* Video height */

1751

avio_wb32(pb, 0x00480000); /* Horizontal resolution 72dpi */

1752

avio_wb32(pb, 0x00480000); /* Vertical resolution 72dpi */

1753

avio_wb32(pb, 0); /* Data size (= 0) */

1754

avio_wb16(pb, 1); /* Frame count (= 1) */

COSMETICS: Remove all trailing whitespace.

Dec 17, 2005

1755

only set fields for mov, reserved for 3gp, mp4

Aug 7, 2006

1756

/* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */

avformat/movenc: set pretty compressor name for XDCAM

Oct 7, 2013

1757

find_compressor(compressor_name, 32, track);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1758

avio_w8(pb, strlen(compressor_name));

1759

avio_write(pb, compressor_name, 31);

COSMETICS: Remove all trailing whitespace.

Dec 17, 2005

1760

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1761

if (track->mode == MODE_MOV && track->par->bits_per_coded_sample)

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1762

avio_wb16(pb, track->par->bits_per_coded_sample |

1763

(track->par->format == AV_PIX_FMT_GRAY8 ? 0x20 : 0));

support rawvideo in mov

Jan 31, 2008

1764

else

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1765

avio_wb16(pb, 0x18); /* Reserved */

lavf/movenc: Add palette to video sample description

Feb 26, 2016

1766

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1767

if (track->mode == MODE_MOV && track->par->format == AV_PIX_FMT_PAL8) {

1768

int pal_size = 1 << track->par->bits_per_coded_sample;

lavf/movenc: Add palette to video sample description

Feb 26, 2016

1769

int i;

1770

avio_wb16(pb, 0); /* Color table ID */

1771

avio_wb32(pb, 0); /* Color table seed */

1772

avio_wb16(pb, 0x8000); /* Color table flags */

lavf/movenc: Add support for palette side data

Mar 2, 2016

1773

avio_wb16(pb, pal_size - 1); /* Color table size (zero-relative) */

1774

for (i = 0; i < pal_size; i++) {

1775

uint32_t rgb = track->palette[i];

lavf/movenc: Add palette to video sample description

Feb 26, 2016

1776

uint16_t r = (rgb >> 16) & 0xff;

1777

uint16_t g = (rgb >> 8) & 0xff;

1778

uint16_t b = rgb & 0xff;

1779

avio_wb16(pb, 0);

1780

avio_wb16(pb, (r << 8) | r);

1781

avio_wb16(pb, (g << 8) | g);

1782

avio_wb16(pb, (b << 8) | b);

1783

}

1784

} else

1785

avio_wb16(pb, 0xffff); /* Reserved */

1786

movenc: K&R formatting cosmetics

Jul 7, 2013

1787

if (track->tag == MKTAG('m','p','4','v'))

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

1788

mov_write_esds_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1789

else if (track->par->codec_id == AV_CODEC_ID_H263)

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

1790

mov_write_d263_tag(pb);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1791

else if (track->par->codec_id == AV_CODEC_ID_AVUI ||

1792

track->par->codec_id == AV_CODEC_ID_SVQ3) {

Read and write APRG mov atom to allow AVUI streamcopy.

May 15, 2012

1793

mov_write_extradata_tag(pb, track);

Fix avui stream-copy.

Jul 25, 2012

1794

avio_wb32(pb, 0);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1795

} else if (track->par->codec_id == AV_CODEC_ID_DNXHD) {

cosmetics, move case up

Mar 20, 2008

1796

mov_write_avid_tag(pb, track);

avformat/movenc: Move avid DNxHD padding to the correct spot

Feb 16, 2015

1797

avid = 1;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1798

} else if (track->par->codec_id == AV_CODEC_ID_HEVC)

movenc: write hvcC tag for HEVC.

Mar 3, 2014

1799

mov_write_hvcc_tag(pb, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1800

    else if (track->par->codec_id == AV_CODEC_ID_H264 && !TAG_IS_AVCI(track->tag)) {

do nal reformating when muxing H264, create avcc atom

Mar 11, 2006

1801

mov_write_avcc_tag(pb, track);

movenc: K&R formatting cosmetics

Jul 7, 2013

1802

if (track->mode == MODE_IPOD)

ipod/iphone compatible mp4 muxer

Mar 16, 2008

1803

mov_write_uuid_tag_ipod(pb);

Add experimental support for vp9 in iso-bmff

Jun 15, 2016

1804

} else if (track->par->codec_id == AV_CODEC_ID_VP9) {

1805

mov_write_vpcc_tag(mov->fc, pb, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1806

} else if (track->par->codec_id == AV_CODEC_ID_VC1 && track->vos_len > 0)

movenc: Support muxing VC1

Jan 21, 2012

1807

mov_write_dvc1_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1808

else if (track->par->codec_id == AV_CODEC_ID_VP6F ||

1809

track->par->codec_id == AV_CODEC_ID_VP6A) {

movenc: Add an F4V muxer

Sep 17, 2012

1810

/* Don't write any potential extradata here - the cropping

1811

* is signalled via the normal width/height fields. */

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1812

} else if (track->par->codec_id == AV_CODEC_ID_R10K) {

1813

if (track->par->codec_tag == MKTAG('R','1','0','k'))

Handle r10k endianess atom DpxE.

Jan 11, 2015

1814

mov_write_dpxe_tag(pb, track);

movenc: Add an F4V muxer

Sep 17, 2012

1815

} else if (track->vos_len > 0)

use generic 'glbl' atom if extradata is present but no specific metho…

Dec 19, 2007

1816

mov_write_glbl_tag(pb, track);

mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at c…

Sep 28, 2003

1817

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1818

if (track->par->codec_id != AV_CODEC_ID_H264 &&

1819

track->par->codec_id != AV_CODEC_ID_MPEG4 &&

1820

track->par->codec_id != AV_CODEC_ID_DNXHD) {

1821

int field_order = track->par->field_order;

1822

1823

#if FF_API_LAVF_AVCTX

1824

FF_DISABLE_DEPRECATION_WARNINGS

1825

    if (field_order != track->st->codec->field_order && track->st->codec->field_order != AV_FIELD_UNKNOWN)

1826

field_order = track->st->codec->field_order;

1827

FF_ENABLE_DEPRECATION_WARNINGS

1828

#endif

1829

1830

if (field_order != AV_FIELD_UNKNOWN)

1831

mov_write_fiel_tag(pb, track, field_order);

1832

}

Write the fiel atom to mov files independently of the used video coded.

Feb 14, 2013

1833

avformat/movenc: Add support for writing 'gama' atom to QuickTime .mo…

Mar 5, 2015

1834

if (mov->flags & FF_MOV_FLAG_WRITE_GAMA) {

1835

if (track->mode == MODE_MOV)

1836

mov_write_gama_tag(pb, track, mov->gamma);

1837

else

1838

            av_log(mov->fc, AV_LOG_WARNING, "Not writing 'gama' atom. Format is not MOV.\n");

1839

}

movenc: Write 'colr' box correctly for MP4

Feb 26, 2015

1840

if (mov->flags & FF_MOV_FLAG_WRITE_COLR) {

1841

if (track->mode == MODE_MOV || track->mode == MODE_MP4)

1842

mov_write_colr_tag(pb, track);

1843

else

1844

            av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n");

1845

}

avformat/movenc: Add simplistic 'colr' tag writing support to mov con…

Jan 26, 2015

1846

avformat/movenc: write pasp atom even if sar.num == sar.den

Sep 20, 2016

1847

    if (track->par->sample_aspect_ratio.den && track->par->sample_aspect_ratio.num) {

In mov muxer, write pixel aspect ratio tag in mov files.

Jul 8, 2010

1848

mov_write_pasp_tag(pb, track);

1849

}

1850

movenc: support cenc (common encryption)

Dec 7, 2015

1851

if (mov->encryption_scheme != MOV_ENC_NONE) {

1852

ff_mov_cenc_write_sinf_tag(track, pb, mov->encryption_kid);

1853

}

1854

avformat/movenc: Move avid DNxHD padding to the correct spot

Feb 16, 2015

1855

/* extra padding for avid stsd */

1856

    /* https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/QTFFChap2/qtff2.html#//apple_ref/doc/uid/TP40000939-CH204-61112 */

1857

if (avid)

1858

avio_wb32(pb, 0);

1859

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1860

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1861

}

1862

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1863

static int mov_write_rtp_tag(AVIOContext *pb, MOVTrack *track)

Add initial support for RTP hinting in the mov muxer

May 18, 2010

1864

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

1865

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1866

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1867

ffio_wfourcc(pb, "rtp ");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1868

avio_wb32(pb, 0); /* Reserved */

1869

avio_wb16(pb, 0); /* Reserved */

1870

avio_wb16(pb, 1); /* Data-reference index */

Add initial support for RTP hinting in the mov muxer

May 18, 2010

1871

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1872

avio_wb16(pb, 1); /* Hint track version */

1873

avio_wb16(pb, 1); /* Highest compatible version */

1874

avio_wb32(pb, track->max_packet_size); /* Max packet size */

Add initial support for RTP hinting in the mov muxer

May 18, 2010

1875

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1876

avio_wb32(pb, 12); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1877

ffio_wfourcc(pb, "tims");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1878

avio_wb32(pb, track->timescale);

Add initial support for RTP hinting in the mov muxer

May 18, 2010

1879

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1880

return update_size(pb, pos);

Add initial support for RTP hinting in the mov muxer

May 18, 2010

1881

}

1882

avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX

Aug 10, 2014

1883

static int mov_write_source_reference_tag(AVIOContext *pb, MOVTrack *track, const char *reel_name)

1884

{

1885

uint64_t str_size =strlen(reel_name);

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

1886

int64_t pos = avio_tell(pb);

avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX

Aug 10, 2014

1887

1888

if (str_size >= UINT16_MAX){

avformat/movenc: Fix printf type

Aug 10, 2014

1889

        av_log(NULL, AV_LOG_ERROR, "reel_name length %"PRIu64" is too large\n", str_size);

avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX

Aug 10, 2014

1890

avio_wb16(pb, 0);

1891

return AVERROR(EINVAL);

1892

}

1893

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

1894

avio_wb32(pb, 0); /* size */

1895

ffio_wfourcc(pb, "name"); /* Data format */

avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX

Aug 10, 2014

1896

avio_wb16(pb, str_size); /* string size */

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

1897

avio_wb16(pb, track->language); /* langcode */

avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX

Aug 10, 2014

1898

avio_write(pb, reel_name, str_size); /* reel name */

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

1899

return update_size(pb,pos);

1900

}

1901

movenc: add timecode track support.

Mar 5, 2012

1902

static int mov_write_tmcd_tag(AVIOContext *pb, MOVTrack *track)

1903

{

1904

int64_t pos = avio_tell(pb);

Merge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'

Aug 26, 2013

1905

#if 1

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1906

int frame_duration;

1907

int nb_frames;

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

1908

AVDictionaryEntry *t = NULL;

movenc: add timecode track support.

Mar 5, 2012

1909

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1910

if (!track->st->avg_frame_rate.num || !track->st->avg_frame_rate.den) {

1911

#if FF_API_LAVF_AVCTX

1912

FF_DISABLE_DEPRECATION_WARNINGS

1913

        frame_duration = av_rescale(track->timescale, track->st->codec->time_base.num, track->st->codec->time_base.den);

1914

        nb_frames      = ROUNDED_DIV(track->st->codec->time_base.den, track->st->codec->time_base.num);

1915

FF_ENABLE_DEPRECATION_WARNINGS

1916

#else

1917

av_log(NULL, AV_LOG_ERROR, "avg_frame_rate not set for tmcd track.\n");

1918

return AVERROR(EINVAL);

1919

#endif

1920

} else {

1921

        frame_duration = av_rescale(track->timescale, track->st->avg_frame_rate.num, track->st->avg_frame_rate.den);

1922

        nb_frames      = ROUNDED_DIV(track->st->avg_frame_rate.den, track->st->avg_frame_rate.num);

1923

}

1924

movenc: check that fps for tmcd is within encodable range.

Jan 17, 2013

1925

if (nb_frames > 255) {

1926

av_log(NULL, AV_LOG_ERROR, "fps %d is too large\n", nb_frames);

1927

return AVERROR(EINVAL);

1928

}

1929

movenc: add timecode track support.

Mar 5, 2012

1930

avio_wb32(pb, 0); /* size */

1931

ffio_wfourcc(pb, "tmcd"); /* Data format */

1932

avio_wb32(pb, 0); /* Reserved */

1933

avio_wb32(pb, 1); /* Data reference index */

1934

avio_wb32(pb, 0); /* Flags */

1935

avio_wb32(pb, track->timecode_flags); /* Flags (timecode) */

1936

avio_wb32(pb, track->timescale); /* Timescale */

1937

avio_wb32(pb, frame_duration); /* Frame duration */

1938

avio_w8(pb, nb_frames); /* Number of frames */

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

1939

avio_w8(pb, 0); /* Reserved */

1940

libavformat/movenc: remove unnecessary null check

May 30, 2016

1941

t = av_dict_get(track->st->metadata, "reel_name", NULL, 0);

movenc: Timecode in MP4 Although MP4 does not have a concrete specifi…

Jan 21, 2016

1942

if (t && utf8len(t->value) && track->mode != MODE_MP4)

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

1943

mov_write_source_reference_tag(pb, track, t->value);

1944

else

1945

avio_wb16(pb, 0); /* zero size */

Merge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'

Aug 26, 2013

1946

#else

movenc: add timecode track support.

Mar 5, 2012

1947

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1948

avio_wb32(pb, 0); /* size */

mov: Write tmcd extradata

Aug 25, 2013

1949

ffio_wfourcc(pb, "tmcd"); /* Data format */

1950

avio_wb32(pb, 0); /* Reserved */

1951

avio_wb32(pb, 1); /* Data reference index */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1952

if (track->par->extradata_size)

1953

avio_write(pb, track->par->extradata, track->par->extradata_size);

Merge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'

Aug 26, 2013

1954

#endif

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1955

return update_size(pb, pos);

Add initial support for RTP hinting in the mov muxer

May 18, 2010

1956

}

1957

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1958

static int mov_write_stsd_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext *mov, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1959

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

1960

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1961

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

1962

ffio_wfourcc(pb, "stsd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

1963

avio_wb32(pb, 0); /* version & flags */

1964

avio_wb32(pb, 1); /* entry count */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1965

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO)

movenc: support cenc (common encryption)

Dec 7, 2015

1966

mov_write_video_tag(pb, mov, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1967

else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO)

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

1968

mov_write_audio_tag(s, pb, mov, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1969

else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE)

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

1970

mov_write_subtitle_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1971

else if (track->par->codec_tag == MKTAG('r','t','p',' '))

Add initial support for RTP hinting in the mov muxer

May 18, 2010

1972

mov_write_rtp_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

1973

else if (track->par->codec_tag == MKTAG('t','m','c','d'))

movenc: add timecode track support.

Mar 5, 2012

1974

mov_write_tmcd_tag(pb, track);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

1975

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

1976

}

1977

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

1978

static int mov_write_ctts_tag(AVIOContext *pb, MOVTrack *track)

CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjo…

Feb 22, 2006

1979

{

remove _t in typedef for POSIX compatibility

Dec 11, 2008

1980

MOVStts *ctts_entries;

CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjo…

Feb 22, 2006

1981

uint32_t entries = 0;

1982

uint32_t atom_size;

1983

int i;

1984

avformat/movenc: use av_malloc(z)_array()

Jun 8, 2014

1985

    ctts_entries = av_malloc_array((track->entry + 1), sizeof(*ctts_entries)); /* worst case */

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

1986

if (!ctts_entries)

1987

return AVERROR(ENOMEM);

CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjo…

Feb 22, 2006

1988

ctts_entries[0].count = 1;

simplify

Jun 24, 2006

1989

ctts_entries[0].duration = track->cluster[0].cts;

movenc: K&R formatting cosmetics

Jul 7, 2013

1990

for (i = 1; i < track->entry; i++) {

simplify

Jun 24, 2006

1991

if (track->cluster[i].cts == ctts_entries[entries].duration) {

CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjo…

Feb 22, 2006

1992

ctts_entries[entries].count++; /* compress */

1993

} else {

1994

entries++;

simplify

Jun 24, 2006

1995

ctts_entries[entries].duration = track->cluster[i].cts;

CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjo…

Feb 22, 2006

1996

ctts_entries[entries].count = 1;

1997

}

1998

}

1999

entries++; /* last one */

2000

atom_size = 16 + (entries * 8);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2001

avio_wb32(pb, atom_size); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2002

ffio_wfourcc(pb, "ctts");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2003

avio_wb32(pb, 0); /* version & flags */

2004

avio_wb32(pb, entries); /* entry count */

movenc: K&R formatting cosmetics

Jul 7, 2013

2005

for (i = 0; i < entries; i++) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2006

avio_wb32(pb, ctts_entries[i].count);

2007

avio_wb32(pb, ctts_entries[i].duration);

CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjo…

Feb 22, 2006

2008

}

2009

av_free(ctts_entries);

2010

return atom_size;

2011

}

2012

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

2013

/* Time to sample atom */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2014

static int mov_write_stts_tag(AVIOContext *pb, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2015

{

movenc: Keep writing zero-entry stts atoms as intended

Mar 6, 2015

2016

MOVStts *stts_entries = NULL;

mov vfr muxing

Nov 1, 2006

2017

uint32_t entries = -1;

2018

uint32_t atom_size;

2019

int i;

2020

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2021

if (track->par->codec_type == AVMEDIA_TYPE_AUDIO && !track->audio_vbr) {

mov vfr muxing

Nov 1, 2006

2022

stts_entries = av_malloc(sizeof(*stts_entries)); /* one entry */

movenc: Check memory allocations

Feb 1, 2015

2023

if (!stts_entries)

2024

return AVERROR(ENOMEM);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2025

stts_entries[0].count = track->sample_count;

mov vfr muxing

Nov 1, 2006

2026

stts_entries[0].duration = 1;

2027

entries = 1;

2028

} else {

movenc: Keep writing zero-entry stts atoms as intended

Mar 6, 2015

2029

if (track->entry) {

Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'

Mar 6, 2015

2030

            stts_entries = av_malloc_array(track->entry, sizeof(*stts_entries)); /* worst case */

movenc: Keep writing zero-entry stts atoms as intended

Mar 6, 2015

2031

if (!stts_entries)

2032

return AVERROR(ENOMEM);

2033

}

movenc: K&R formatting cosmetics

Jul 7, 2013

2034

for (i = 0; i < track->entry; i++) {

movenc: factorize calculation of cluster duration into a separate fun…

Feb 26, 2012

2035

int duration = get_cluster_duration(track, i);

mov vfr muxing

Nov 1, 2006

2036

if (i && duration == stts_entries[entries].duration) {

2037

stts_entries[entries].count++; /* compress */

2038

} else {

2039

entries++;

2040

stts_entries[entries].duration = duration;

2041

stts_entries[entries].count = 1;

2042

}

2043

}

2044

entries++; /* last one */

2045

}

2046

atom_size = 16 + (entries * 8);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2047

avio_wb32(pb, atom_size); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2048

ffio_wfourcc(pb, "stts");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2049

avio_wb32(pb, 0); /* version & flags */

2050

avio_wb32(pb, entries); /* entry count */

movenc: K&R formatting cosmetics

Jul 7, 2013

2051

for (i = 0; i < entries; i++) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2052

avio_wb32(pb, stts_entries[i].count);

2053

avio_wb32(pb, stts_entries[i].duration);

mov vfr muxing

Nov 1, 2006

2054

}

2055

av_free(stts_entries);

2056

return atom_size;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2057

}

2058

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2059

static int mov_write_dref_tag(AVIOContext *pb)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2060

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2061

avio_wb32(pb, 28); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2062

ffio_wfourcc(pb, "dref");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2063

avio_wb32(pb, 0); /* version & flags */

2064

avio_wb32(pb, 1); /* entry count */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2065

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2066

avio_wb32(pb, 0xc); /* size */

movenc: add FIXME to add alis and rsrc atoms

Jan 14, 2012

2067

//FIXME add the alis and rsrc atom

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2068

ffio_wfourcc(pb, "url ");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2069

avio_wb32(pb, 1); /* version & flags */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2070

2071

return 28;

2072

}

2073

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2074

static int mov_write_stbl_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext *mov, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2075

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2076

int64_t pos = avio_tell(pb);

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2077

int ret;

2078

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2079

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2080

ffio_wfourcc(pb, "stbl");

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2081

mov_write_stsd_tag(s, pb, mov, track);

mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global head…

Sep 9, 2003

2082

mov_write_stts_tag(pb, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2083

if ((track->par->codec_type == AVMEDIA_TYPE_VIDEO ||

2084

track->par->codec_tag == MKTAG('r','t','p',' ')) &&

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2085

track->has_keyframes && track->has_keyframes < track->entry)

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

2086

mov_write_stss_tag(pb, track, MOV_SYNC_SAMPLE);

2087

if (track->mode == MODE_MOV && track->flags & MOV_TRACK_STPS)

2088

mov_write_stss_tag(pb, track, MOV_PARTIAL_SYNC_SAMPLE);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2089

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO &&

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2090

track->flags & MOV_TRACK_CTTS && track->entry) {

2091

2092

if ((ret = mov_write_ctts_tag(pb, track)) < 0)

2093

return ret;

2094

}

mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global head…

Sep 9, 2003

2095

mov_write_stsc_tag(pb, track);

2096

mov_write_stsz_tag(pb, track);

2097

mov_write_stco_tag(pb, track);

movenc: support cenc (common encryption)

Dec 7, 2015

2098

if (mov->encryption_scheme == MOV_ENC_CENC_AES_CTR) {

2099

ff_mov_cenc_write_stbl_atoms(&track->cenc, pb);

2100

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2101

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2102

}

2103

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2104

static int mov_write_dinf_tag(AVIOContext *pb)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2105

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2106

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2107

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2108

ffio_wfourcc(pb, "dinf");

mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global head…

Sep 9, 2003

2109

mov_write_dref_tag(pb);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2110

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2111

}

2112

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2113

static int mov_write_nmhd_tag(AVIOContext *pb)

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

2114

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2115

avio_wb32(pb, 12);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2116

ffio_wfourcc(pb, "nmhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2117

avio_wb32(pb, 0);

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

2118

return 12;

2119

}

2120

movenc: add timecode track support.

Mar 5, 2012

2121

static int mov_write_tcmi_tag(AVIOContext *pb, MOVTrack *track)

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

2122

{

movenc: add timecode track support.

Mar 5, 2012

2123

int64_t pos = avio_tell(pb);

2124

const char *font = "Lucida Grande";

2125

avio_wb32(pb, 0); /* size */

2126

ffio_wfourcc(pb, "tcmi"); /* timecode media information atom */

2127

avio_wb32(pb, 0); /* version & flags */

2128

avio_wb16(pb, 0); /* text font */

2129

avio_wb16(pb, 0); /* text face */

2130

avio_wb16(pb, 12); /* text size */

2131

avio_wb16(pb, 0); /* (unknown, not in the QT specs...) */

2132

avio_wb16(pb, 0x0000); /* text color (red) */

2133

avio_wb16(pb, 0x0000); /* text color (green) */

2134

avio_wb16(pb, 0x0000); /* text color (blue) */

2135

avio_wb16(pb, 0xffff); /* background color (red) */

2136

avio_wb16(pb, 0xffff); /* background color (green) */

2137

avio_wb16(pb, 0xffff); /* background color (blue) */

2138

avio_w8(pb, strlen(font)); /* font len (part of the pascal string) */

2139

avio_write(pb, font, strlen(font)); /* font name */

2140

return update_size(pb, pos);

2141

}

2142

2143

static int mov_write_gmhd_tag(AVIOContext *pb, MOVTrack *track)

2144

{

2145

int64_t pos = avio_tell(pb);

2146

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2147

ffio_wfourcc(pb, "gmhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2148

avio_wb32(pb, 0x18); /* gmin size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2149

ffio_wfourcc(pb, "gmin");/* generic media info */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2150

avio_wb32(pb, 0); /* version & flags */

2151

avio_wb16(pb, 0x40); /* graphics mode = */

2152

avio_wb16(pb, 0x8000); /* opColor (r?) */

2153

avio_wb16(pb, 0x8000); /* opColor (g?) */

2154

avio_wb16(pb, 0x8000); /* opColor (b?) */

2155

avio_wb16(pb, 0); /* balance */

2156

avio_wb16(pb, 0); /* reserved */

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

2157

2158

/*

2159

* This special text atom is required for

2160

* Apple Quicktime chapters. The contents

2161

* don't appear to be documented, so the

2162

* bytes are copied verbatim.

2163

*/

Add QT CC track mux support

Oct 22, 2012

2164

if (track->tag != MKTAG('c','6','0','8')) {

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

2165

avio_wb32(pb, 0x2C); /* size */

2166

ffio_wfourcc(pb, "text");

2167

avio_wb16(pb, 0x01);

2168

avio_wb32(pb, 0x00);

2169

avio_wb32(pb, 0x00);

2170

avio_wb32(pb, 0x00);

2171

avio_wb32(pb, 0x01);

2172

avio_wb32(pb, 0x00);

2173

avio_wb32(pb, 0x00);

2174

avio_wb32(pb, 0x00);

2175

avio_wb32(pb, 0x00004000);

2176

avio_wb16(pb, 0x0000);

Add QT CC track mux support

Oct 22, 2012

2177

}

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

2178

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2179

if (track->par->codec_tag == MKTAG('t','m','c','d')) {

movenc: add timecode track support.

Mar 5, 2012

2180

int64_t tmcd_pos = avio_tell(pb);

2181

avio_wb32(pb, 0); /* size */

2182

ffio_wfourcc(pb, "tmcd");

2183

mov_write_tcmi_tag(pb, track);

2184

update_size(pb, tmcd_pos);

2185

}

2186

return update_size(pb, pos);

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

2187

}

2188

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2189

static int mov_write_smhd_tag(AVIOContext *pb)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2190

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2191

avio_wb32(pb, 16); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2192

ffio_wfourcc(pb, "smhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2193

avio_wb32(pb, 0); /* version & flags */

2194

avio_wb16(pb, 0); /* reserved (balance, normally = 0) */

2195

avio_wb16(pb, 0); /* reserved */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2196

return 16;

2197

}

2198

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2199

static int mov_write_vmhd_tag(AVIOContext *pb)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2200

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2201

avio_wb32(pb, 0x14); /* size (always 0x14) */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2202

ffio_wfourcc(pb, "vmhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2203

avio_wb32(pb, 0x01); /* version & flags */

2204

avio_wb64(pb, 0); /* reserved (graphics mode = copy) */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2205

return 0x14;

2206

}

2207

mov: Emit the correct tags for clcp tracks

Apr 21, 2014

2208

static int is_clcp_track(MOVTrack *track)

2209

{

2210

return track->tag == MKTAG('c','7','0','8') ||

2211

track->tag == MKTAG('c','6','0','8');

2212

}

2213

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2214

static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2215

{

remove warnings about uninitialized vars

Jan 11, 2009

2216

const char *hdlr, *descr = NULL, *hdlr_type = NULL;

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2217

int64_t pos = avio_tell(pb);

COSMETICS: Remove all trailing whitespace.

Dec 17, 2005

2218

mov: Prevent segfaults on mov_write_hdlr_tag

Aug 19, 2013

2219

hdlr = "dhlr";

2220

hdlr_type = "url ";

2221

descr = "DataHandler";

2222

2223

if (track) {

COSMETICS: tabs --> spaces, some prettyprinting

Dec 22, 2005

2224

hdlr = (track->mode == MODE_MOV) ? "mhlr" : "\0\0\0\0";

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2225

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) {

COSMETICS: tabs --> spaces, some prettyprinting

Dec 22, 2005

2226

hdlr_type = "vide";

movenc: K&R formatting cosmetics

Jul 7, 2013

2227

descr = "VideoHandler";

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2228

} else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) {

COSMETICS: tabs --> spaces, some prettyprinting

Dec 22, 2005

2229

hdlr_type = "soun";

movenc: K&R formatting cosmetics

Jul 7, 2013

2230

descr = "SoundHandler";

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2231

} else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE) {

Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'

Apr 25, 2014

2232

if (is_clcp_track(track)) {

Add QT CC track mux support

Oct 22, 2012

2233

hdlr_type = "clcp";

2234

descr = "ClosedCaptionHandler";

2235

} else {

Merge remote-tracking branch 'qatar/master'

Mar 31, 2014

2236

if (track->tag == MKTAG('t','x','3','g')) {

2237

hdlr_type = "sbtl";

2238

} else if (track->tag == MKTAG('m','p','4','s')) {

2239

hdlr_type = "subp";

2240

} else {

2241

hdlr_type = "text";

2242

}

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

2243

descr = "SubtitleHandler";

Add QT CC track mux support

Oct 22, 2012

2244

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2245

} else if (track->par->codec_tag == MKTAG('r','t','p',' ')) {

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2246

hdlr_type = "hint";

movenc: K&R formatting cosmetics

Jul 7, 2013

2247

descr = "HintHandler";

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2248

} else if (track->par->codec_tag == MKTAG('t','m','c','d')) {

mov: Prevent segfaults on mov_write_hdlr_tag

Aug 19, 2013

2249

hdlr_type = "tmcd";

2250

descr = "TimeCodeHandler";

movenc: add some default cases.

Mar 24, 2012

2251

} else {

mov: Prevent segfaults on mov_write_hdlr_tag

Aug 19, 2013

2252

char tag_buf[32];

2253

av_get_codec_tag_string(tag_buf, sizeof(tag_buf),

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2254

track->par->codec_tag);

mov: Prevent segfaults on mov_write_hdlr_tag

Aug 19, 2013

2255

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2256

av_log(s, AV_LOG_WARNING,

mov: Prevent segfaults on mov_write_hdlr_tag

Aug 19, 2013

2257

"Unknown hldr_type for %s / 0x%04X, writing dummy values\n",

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2258

tag_buf, track->par->codec_tag);

COSMETICS: tabs --> spaces, some prettyprinting

Dec 22, 2005

2259

}

movenc: add track title to tracks

Jul 31, 2014

2260

if (track->st) {

2261

// hdlr.name is used by some players to identify the content title

2262

// of the track. So if an alternate handler description is

2263

// specified, use it.

2264

AVDictionaryEntry *t;

2265

t = av_dict_get(track->st->metadata, "handler", NULL, 0);

2266

if (t && utf8len(t->value))

2267

descr = t->value;

2268

}

* making .mov files generated by ffmpeg compatible with Apple software.

Mar 28, 2004

2269

}

COSMETICS: Remove all trailing whitespace.

Dec 17, 2005

2270

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2271

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2272

ffio_wfourcc(pb, "hdlr");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2273

avio_wb32(pb, 0); /* Version & flags */

2274

avio_write(pb, hdlr, 4); /* handler */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2275

ffio_wfourcc(pb, hdlr_type); /* handler type */

movenc: K&R formatting cosmetics

Jul 7, 2013

2276

avio_wb32(pb, 0); /* reserved */

2277

avio_wb32(pb, 0); /* reserved */

2278

avio_wb32(pb, 0); /* reserved */

fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, lar…

May 23, 2009

2279

if (!track || track->mode == MODE_MOV)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2280

avio_w8(pb, strlen(descr)); /* pascal string */

2281

avio_write(pb, descr, strlen(descr)); /* handler description */

fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, lar…

May 23, 2009

2282

if (track && track->mode != MODE_MOV)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2283

avio_w8(pb, 0); /* c string */

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2284

return update_size(pb, pos);

* making .mov files generated by ffmpeg compatible with Apple software.

Mar 28, 2004

2285

}

2286

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2287

static int mov_write_hmhd_tag(AVIOContext *pb)

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2288

{

2289

/* This atom must be present, but leaving the values at zero

2290

* seems harmless. */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2291

avio_wb32(pb, 28); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2292

ffio_wfourcc(pb, "hmhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2293

avio_wb32(pb, 0); /* version, flags */

2294

avio_wb16(pb, 0); /* maxPDUsize */

2295

avio_wb16(pb, 0); /* avgPDUsize */

2296

avio_wb32(pb, 0); /* maxbitrate */

2297

avio_wb32(pb, 0); /* avgbitrate */

2298

avio_wb32(pb, 0); /* reserved */

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2299

return 28;

2300

}

2301

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2302

static int mov_write_minf_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext *mov, MOVTrack *track)

* making .mov files generated by ffmpeg compatible with Apple software.

Mar 28, 2004

2303

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2304

int64_t pos = avio_tell(pb);

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2305

int ret;

2306

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2307

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2308

ffio_wfourcc(pb, "minf");

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2309

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO)

* making .mov files generated by ffmpeg compatible with Apple software.

Mar 28, 2004

2310

mov_write_vmhd_tag(pb);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2311

else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO)

* making .mov files generated by ffmpeg compatible with Apple software.

Mar 28, 2004

2312

mov_write_smhd_tag(pb);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2313

else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE) {

mov: Emit the correct tags for clcp tracks

Apr 21, 2014

2314

if (track->tag == MKTAG('t','e','x','t') || is_clcp_track(track)) {

Add QT CC track mux support

Oct 22, 2012

2315

mov_write_gmhd_tag(pb, track);

2316

} else {

2317

mov_write_nmhd_tag(pb);

2318

}

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2319

} else if (track->tag == MKTAG('r','t','p',' ')) {

2320

mov_write_hmhd_tag(pb);

mov: Write tmcd extradata

Aug 25, 2013

2321

} else if (track->tag == MKTAG('t','m','c','d')) {

lavf/movenc: Allow to disable writing the timecode track.

Sep 26, 2016

2322

if (track->mode != MODE_MOV)

movenc: Timecode in MP4 Although MP4 does not have a concrete specifi…

Jan 21, 2016

2323

mov_write_nmhd_tag(pb);

2324

else

2325

mov_write_gmhd_tag(pb, track);

Add support for muxing mov/mp4/3gp timed text streams

Jan 11, 2009

2326

}

* making .mov files generated by ffmpeg compatible with Apple software.

Mar 28, 2004

2327

if (track->mode == MODE_MOV) /* FIXME: Why do it for MODE_MOV only ? */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2328

mov_write_hdlr_tag(s, pb, NULL);

* making .mov files generated by ffmpeg compatible with Apple software.

Mar 28, 2004

2329

mov_write_dinf_tag(pb);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2330

if ((ret = mov_write_stbl_tag(s, pb, mov, track)) < 0)

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2331

return ret;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2332

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2333

}

2334

movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

Oct 29, 2014

2335

static int mov_write_mdhd_tag(AVIOContext *pb, MOVMuxContext *mov,

2336

MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2337

{

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2338

int version = track->track_duration < INT32_MAX ? 0 : 1;

use 64bit atom version if needed

Mar 26, 2006

2339

movenc: Write the unknown duration as 64 bit fields in ismv

Feb 17, 2012

2340

if (track->mode == MODE_ISM)

2341

version = 1;

2342

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2343

(version == 1) ? avio_wb32(pb, 44) : avio_wb32(pb, 32); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2344

ffio_wfourcc(pb, "mdhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2345

avio_w8(pb, version);

2346

avio_wb24(pb, 0); /* flags */

use 64bit atom version if needed

Mar 26, 2006

2347

if (version == 1) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2348

avio_wb64(pb, track->time);

2349

avio_wb64(pb, track->time);

use 64bit atom version if needed

Mar 26, 2006

2350

} else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2351

avio_wb32(pb, track->time); /* creation time */

2352

avio_wb32(pb, track->time); /* modification time */

use 64bit atom version if needed

Mar 26, 2006

2353

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2354

avio_wb32(pb, track->timescale); /* time scale (sample rate for audio) */

movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

Oct 29, 2014

2355

if (!track->entry && mov->mode == MODE_ISM)

movenc: Write track durations with all bits set if duration is unknown

Jan 27, 2012

2356

        (version == 1) ? avio_wb64(pb, UINT64_C(0xffffffffffffffff)) : avio_wb32(pb, 0xffffffff);

movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

Oct 29, 2014

2357

else if (!track->entry)

2358

(version == 1) ? avio_wb64(pb, 0) : avio_wb32(pb, 0);

movenc: Write track durations with all bits set if duration is unknown

Jan 27, 2012

2359

else

2360

        (version == 1) ? avio_wb64(pb, track->track_duration) : avio_wb32(pb, track->track_duration); /* duration */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2361

avio_wb16(pb, track->language); /* language */

2362

avio_wb16(pb, 0); /* reserved (quality) */

warn the user about the the mdhd problem

May 30, 2007

2363

movenc: K&R formatting cosmetics

Jul 7, 2013

2364

if (version != 0 && track->mode == MODE_MOV) {

warn the user about the the mdhd problem

May 30, 2007

2365

av_log(NULL, AV_LOG_ERROR,

movenc: K&R formatting cosmetics

Jul 7, 2013

2366

"FATAL error, file duration too long for timebase, this file will not be\n"

2367

"playable with quicktime. Choose a different timebase or a different\n"

2368

"container format\n");

warn the user about the the mdhd problem

May 30, 2007

2369

}

2370

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2371

return 32;

2372

}

2373

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2374

static int mov_write_mdia_tag(AVFormatContext *s, AVIOContext *pb,

2375

MOVMuxContext *mov, MOVTrack *track)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2376

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2377

int64_t pos = avio_tell(pb);

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2378

int ret;

2379

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2380

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2381

ffio_wfourcc(pb, "mdia");

movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

Oct 29, 2014

2382

mov_write_mdhd_tag(pb, mov, track);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2383

mov_write_hdlr_tag(s, pb, track);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2384

if ((ret = mov_write_minf_tag(s, pb, mov, track)) < 0)

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2385

return ret;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2386

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2387

}

2388

movenc: write track header transformation matrix depending on "rotate…

Jul 13, 2012

2389

/* transformation matrix

2390

|a b u|

2391

|c d v|

2392

|tx ty w| */

2393

static void write_matrix(AVIOContext *pb, int16_t a, int16_t b, int16_t c,

2394

int16_t d, int16_t tx, int16_t ty)

2395

{

2396

avio_wb32(pb, a << 16); /* 16.16 format */

2397

avio_wb32(pb, b << 16); /* 16.16 format */

2398

avio_wb32(pb, 0); /* u in 2.30 format */

2399

avio_wb32(pb, c << 16); /* 16.16 format */

2400

avio_wb32(pb, d << 16); /* 16.16 format */

2401

avio_wb32(pb, 0); /* v in 2.30 format */

2402

avio_wb32(pb, tx << 16); /* 16.16 format */

2403

avio_wb32(pb, ty << 16); /* 16.16 format */

2404

avio_wb32(pb, 1 << 30); /* w in 2.30 format */

2405

}

2406

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

2407

static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov,

2408

MOVTrack *track, AVStream *st)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2409

{

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2410

int64_t duration = av_rescale_rnd(track->track_duration, MOV_TIMESCALE,

remove useless mov timescale field

Nov 29, 2009

2411

track->timescale, AV_ROUND_UP);

use 64bit atom version if needed

Mar 26, 2006

2412

int version = duration < INT32_MAX ? 0 : 1;

mov: Clarify tkhd flag settings

Jul 4, 2014

2413

int flags = MOV_TKHD_FLAG_IN_MOVIE;

movenc: write track header transformation matrix depending on "rotate…

Jul 13, 2012

2414

int rotation = 0;

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

2415

int group = 0;

2416

movenc: write the display transform matrix

Mar 12, 2015

2417

uint32_t *display_matrix = NULL;

2418

int display_matrix_size, i;

mov: Clarify tkhd flag settings

Jul 4, 2014

2419

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

2420

if (st) {

2421

if (mov->per_stream_grouping)

2422

group = st->index;

2423

else

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2424

group = st->codecpar->codec_type;

movenc: write the display transform matrix

Mar 12, 2015

2425

2426

        display_matrix = (uint32_t*)av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX,

2427

&display_matrix_size);

avformat/movenc: avoid using uninitialized display_matrix_size

Mar 20, 2015

2428

if (display_matrix && display_matrix_size < 9 * sizeof(*display_matrix))

movenc: write the display transform matrix

Mar 12, 2015

2429

display_matrix = NULL;

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

2430

}

use 64bit atom version if needed

Mar 26, 2006

2431

mov: Clarify tkhd flag settings

Jul 4, 2014

2432

if (track->flags & MOV_TRACK_ENABLED)

2433

flags |= MOV_TKHD_FLAG_ENABLED;

2434

movenc: Write the unknown duration as 64 bit fields in ismv

Feb 17, 2012

2435

if (track->mode == MODE_ISM)

2436

version = 1;

2437

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2438

(version == 1) ? avio_wb32(pb, 104) : avio_wb32(pb, 92); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2439

ffio_wfourcc(pb, "tkhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2440

avio_w8(pb, version);

mov: Clarify tkhd flag settings

Jul 4, 2014

2441

avio_wb24(pb, flags);

use 64bit atom version if needed

Mar 26, 2006

2442

if (version == 1) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2443

avio_wb64(pb, track->time);

2444

avio_wb64(pb, track->time);

use 64bit atom version if needed

Mar 26, 2006

2445

} else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2446

avio_wb32(pb, track->time); /* creation time */

2447

avio_wb32(pb, track->time); /* modification time */

use 64bit atom version if needed

Mar 26, 2006

2448

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2449

avio_wb32(pb, track->track_id); /* track-id */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2450

avio_wb32(pb, 0); /* reserved */

movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

Oct 29, 2014

2451

if (!track->entry && mov->mode == MODE_ISM)

movenc: Write track durations with all bits set if duration is unknown

Jan 27, 2012

2452

        (version == 1) ? avio_wb64(pb, UINT64_C(0xffffffffffffffff)) : avio_wb32(pb, 0xffffffff);

movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

Oct 29, 2014

2453

else if (!track->entry)

2454

(version == 1) ? avio_wb64(pb, 0) : avio_wb32(pb, 0);

movenc: Write track durations with all bits set if duration is unknown

Jan 27, 2012

2455

else

2456

(version == 1) ? avio_wb64(pb, duration) : avio_wb32(pb, duration);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2457

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2458

avio_wb32(pb, 0); /* reserved */

2459

avio_wb32(pb, 0); /* reserved */

movenc: create an alternate group for each media type

Sep 16, 2011

2460

avio_wb16(pb, 0); /* layer */

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

2461

avio_wb16(pb, group); /* alternate group) */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2462

/* Volume, only for audio */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2463

if (track->par->codec_type == AVMEDIA_TYPE_AUDIO)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2464

avio_wb16(pb, 0x0100);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2465

else

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2466

avio_wb16(pb, 0);

2467

avio_wb16(pb, 0); /* reserved */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2468

2469

/* Matrix structure */

movenc: write track header transformation matrix depending on "rotate…

Jul 13, 2012

2470

if (st && st->metadata) {

2471

AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate", NULL, 0);

2472

rotation = (rot && rot->value) ? atoi(rot->value) : 0;

2473

}

movenc: write the display transform matrix

Mar 12, 2015

2474

if (display_matrix) {

2475

for (i = 0; i < 9; i++)

2476

avio_wb32(pb, display_matrix[i]);

Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'

Mar 20, 2015

2477

} else if (rotation == 90) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2478

write_matrix(pb, 0, 1, -1, 0, track->par->height, 0);

movenc: write track header transformation matrix depending on "rotate…

Jul 13, 2012

2479

} else if (rotation == 180) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2480

write_matrix(pb, -1, 0, 0, -1, track->par->width, track->par->height);

movenc: write track header transformation matrix depending on "rotate…

Jul 13, 2012

2481

} else if (rotation == 270) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2482

write_matrix(pb, 0, -1, 1, 0, 0, track->par->width);

movenc: write track header transformation matrix depending on "rotate…

Jul 13, 2012

2483

} else {

2484

write_matrix(pb, 1, 0, 0, 1, 0, 0);

2485

}

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2486

/* Track width and height, for visual only */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2487

if (st && (track->par->codec_type == AVMEDIA_TYPE_VIDEO ||

2488

track->par->codec_type == AVMEDIA_TYPE_SUBTITLE)) {

avformat/movenc: Fix potential track width/height overflows

May 29, 2016

2489

int64_t track_width_1616;

movenc: K&R formatting cosmetics

Jul 7, 2013

2490

if (track->mode == MODE_MOV) {

avformat/movenc: Fix potential track width/height overflows

May 29, 2016

2491

track_width_1616 = track->par->width * 0x10000ULL;

use tapt atom for sample aspect ratio

Feb 25, 2011

2492

} else {

avformat/movenc: Fix potential track width/height overflows

May 29, 2016

2493

track_width_1616 = av_rescale(st->sample_aspect_ratio.num,

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2494

track->par->width * 0x10000LL,

avformat/movenc: avoid floats in width/height/aspect ratio computations

May 29, 2015

2495

st->sample_aspect_ratio.den);

avformat/movenc: Check that track_width_1616 fits within the availabl…

May 29, 2015

2496

if (!track_width_1616 ||

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2497

track->height != track->par->height ||

avformat/movenc: Check that track_width_1616 fits within the availabl…

May 29, 2015

2498

track_width_1616 > UINT32_MAX)

avformat/movenc: Avoid integer overflow

May 29, 2016

2499

track_width_1616 = track->par->width * 0x10000ULL;

use tapt atom for sample aspect ratio

Feb 25, 2011

2500

}

avformat/movenc: Fix potential track width/height overflows

May 29, 2016

2501

if (track_width_1616 > UINT32_MAX) {

2502

av_log(mov->fc, AV_LOG_WARNING, "track width is too large\n");

2503

track_width_1616 = 0;

2504

}

2505

avio_wb32(pb, track_width_1616);

2506

if (track->height > 0xFFFF) {

2507

av_log(mov->fc, AV_LOG_WARNING, "track height is too large\n");

2508

avio_wb32(pb, 0);

2509

} else

2510

avio_wb32(pb, track->height * 0x10000U);

movenc: K&R formatting cosmetics

Jul 7, 2013

2511

} else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2512

avio_wb32(pb, 0);

2513

avio_wb32(pb, 0);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2514

}

2515

return 0x5c;

2516

}

2517

movenc: remove uses of deprecated API.

Feb 25, 2011

2518

static int mov_write_tapt_tag(AVIOContext *pb, MOVTrack *track)

use tapt atom for sample aspect ratio

Feb 25, 2011

2519

{

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2520

    int32_t width = av_rescale(track->par->sample_aspect_ratio.num, track->par->width,

2521

track->par->sample_aspect_ratio.den);

use tapt atom for sample aspect ratio

Feb 25, 2011

2522

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2523

int64_t pos = avio_tell(pb);

use tapt atom for sample aspect ratio

Feb 25, 2011

2524

2525

avio_wb32(pb, 0); /* size */

movenc: remove uses of deprecated API.

Feb 25, 2011

2526

ffio_wfourcc(pb, "tapt");

use tapt atom for sample aspect ratio

Feb 25, 2011

2527

2528

avio_wb32(pb, 20);

movenc: remove uses of deprecated API.

Feb 25, 2011

2529

ffio_wfourcc(pb, "clef");

use tapt atom for sample aspect ratio

Feb 25, 2011

2530

avio_wb32(pb, 0);

movenc: Add required 'prof' atom to 'tapt' atom set.

Oct 29, 2012

2531

avio_wb32(pb, width << 16);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2532

avio_wb32(pb, track->par->height << 16);

movenc: Add required 'prof' atom to 'tapt' atom set.

Oct 29, 2012

2533

2534

avio_wb32(pb, 20);

2535

ffio_wfourcc(pb, "prof");

2536

avio_wb32(pb, 0);

use tapt atom for sample aspect ratio

Feb 25, 2011

2537

avio_wb32(pb, width << 16);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2538

avio_wb32(pb, track->par->height << 16);

use tapt atom for sample aspect ratio

Feb 25, 2011

2539

2540

avio_wb32(pb, 20);

movenc: remove uses of deprecated API.

Feb 25, 2011

2541

ffio_wfourcc(pb, "enof");

use tapt atom for sample aspect ratio

Feb 25, 2011

2542

avio_wb32(pb, 0);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2543

avio_wb32(pb, track->par->width << 16);

2544

avio_wb32(pb, track->par->height << 16);

use tapt atom for sample aspect ratio

Feb 25, 2011

2545

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2546

return update_size(pb, pos);

Remove extraneous semicolons

Dec 11, 2011

2547

}

use tapt atom for sample aspect ratio

Feb 25, 2011

2548

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2549

// This box seems important for the psp playback ... without it the movie seems to hang

movenc: Write edit lists for fragmented files as well, if necessary

Oct 11, 2014

2550

static int mov_write_edts_tag(AVIOContext *pb, MOVMuxContext *mov,

2551

MOVTrack *track)

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2552

{

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2553

int64_t duration = av_rescale_rnd(track->track_duration, MOV_TIMESCALE,

improved 'edts' atom writing support

May 2, 2011

2554

track->timescale, AV_ROUND_UP);

2555

int version = duration < INT32_MAX ? 0 : 1;

2556

int entry_size, entry_count, size;

movenc: Use start_dts/cts instead of cluster[0] for writing edit lists

Nov 3, 2014

2557

int64_t delay, start_ct = track->start_cts;

avformat/movenc: Use cluster timestamps when available in edts

Jan 3, 2015

2558

int64_t start_dts = track->start_dts;

2559

2560

if (track->entry) {

2561

if (start_dts != track->cluster[0].dts || start_ct != track->cluster[0].cts) {

2562

2563

av_log(mov->fc, AV_LOG_DEBUG,

2564

                   "EDTS using dts:%"PRId64" cts:%d instead of dts:%"PRId64" cts:%"PRId64" tid:%d\n",

2565

track->cluster[0].dts, track->cluster[0].cts,

2566

start_dts, start_ct, track->track_id);

2567

start_dts = track->cluster[0].dts;

2568

start_ct = track->cluster[0].cts;

2569

}

2570

}

2571

2572

delay = av_rescale_rnd(start_dts + start_ct, MOV_TIMESCALE,

improved 'edts' atom writing support

May 2, 2011

2573

track->timescale, AV_ROUND_DOWN);

2574

version |= delay < INT32_MAX ? 0 : 1;

2575

2576

entry_size = (version == 1) ? 20 : 12;

2577

entry_count = 1 + (delay > 0);

2578

size = 24 + entry_count * entry_size;

2579

2580

/* write the atom data */

2581

avio_wb32(pb, size);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2582

ffio_wfourcc(pb, "edts");

improved 'edts' atom writing support

May 2, 2011

2583

avio_wb32(pb, size - 8);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2584

ffio_wfourcc(pb, "elst");

improved 'edts' atom writing support

May 2, 2011

2585

avio_w8(pb, version);

2586

avio_wb24(pb, 0); /* flags */

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2587

improved 'edts' atom writing support

May 2, 2011

2588

avio_wb32(pb, entry_count);

2589

if (delay > 0) { /* add an empty edit to delay presentation */

movenc: Add some comments explaining subtle details in writing the ed…

Oct 11, 2014

2590

/* In the positive delay case, the delay includes the cts

2591

* offset, and the second edit list entry below trims out

2592

* the same amount from the actual content. This makes sure

cosmetics: Fix spelling mistakes

Apr 27, 2016

2593

* that the offset last sample is included in the edit

movenc: Add some comments explaining subtle details in writing the ed…

Oct 11, 2014

2594

* list duration as well. */

improved 'edts' atom writing support

May 2, 2011

2595

if (version == 1) {

2596

avio_wb64(pb, delay);

2597

avio_wb64(pb, -1);

2598

} else {

2599

avio_wb32(pb, delay);

2600

avio_wb32(pb, -1);

2601

}

2602

avio_wb32(pb, 0x00010000);

movenc: fix edit list for the case of negative pts.

Sep 29, 2012

2603

} else {

movenc: Adjust edit lists to trim out parts of tracks with negative pts

Sep 29, 2012

2604

/* Avoid accidentally ending up with start_ct = -1 which has got a

2605

* special meaning. Normally start_ct should end up positive or zero

fix some a/an typos

Mar 28, 2016

2606

* here, but use FFMIN in case dts is a small positive integer

movenc: Adjust edit lists to trim out parts of tracks with negative pts

Sep 29, 2012

2607

* rounded to 0 when represented in MOV_TIMESCALE units. */

avformat/movenc: Use cluster timestamps when available in edts

Jan 3, 2015

2608

        av_assert0(av_rescale_rnd(start_dts, MOV_TIMESCALE, track->timescale, AV_ROUND_DOWN) <= 0);

2609

start_ct = -FFMIN(start_dts, 0);

movenc: Add some comments explaining subtle details in writing the ed…

Oct 11, 2014

2610

/* Note, this delay is calculated from the pts of the first sample,

2611

* ensuring that we don't reduce the duration for cases with

2612

* dts<0 pts=0. */

movenc: fix edit list for the case of negative pts.

Sep 29, 2012

2613

duration += delay;

improved 'edts' atom writing support

May 2, 2011

2614

}

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2615

movenc: Write edit lists for fragmented files as well, if necessary

Oct 11, 2014

2616

/* For fragmented files, we don't know the full length yet. Setting

2617

* duration to 0 allows us to only specify the offset, including

2618

* the rest of the content (from all future fragments) without specifying

2619

* an explicit duration. */

2620

if (mov->flags & FF_MOV_FLAG_FRAGMENT)

2621

duration = 0;

2622

improved 'edts' atom writing support

May 2, 2011

2623

/* duration */

2624

if (version == 1) {

2625

avio_wb64(pb, duration);

2626

avio_wb64(pb, start_ct);

2627

} else {

2628

avio_wb32(pb, duration);

2629

avio_wb32(pb, start_ct);

2630

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2631

avio_wb32(pb, 0x00010000);

improved 'edts' atom writing support

May 2, 2011

2632

return size;

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2633

}

2634

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2635

static int mov_write_tref_tag(AVIOContext *pb, MOVTrack *track)

movenc: Write QuickTime chapters

May 5, 2010

2636

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2637

avio_wb32(pb, 20); // size

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2638

ffio_wfourcc(pb, "tref");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2639

avio_wb32(pb, 12); // size (subatom)

2640

avio_wl32(pb, track->tref_tag);

2641

avio_wb32(pb, track->tref_id);

movenc: Write QuickTime chapters

May 5, 2010

2642

return 20;

2643

}

2644

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2645

// goes at the end of each track!  ... Critical for PSP playback ("Incompatible data" without it)

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2646

static int mov_write_uuid_tag_psp(AVIOContext *pb, MOVTrack *mov)

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2647

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2648

avio_wb32(pb, 0x34); /* size ... reports as 28 in mp4box! */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2649

ffio_wfourcc(pb, "uuid");

2650

ffio_wfourcc(pb, "USMT");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2651

avio_wb32(pb, 0x21d24fce);

2652

avio_wb32(pb, 0xbb88695c);

2653

avio_wb32(pb, 0xfac9c740);

2654

avio_wb32(pb, 0x1c); // another size here!

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2655

ffio_wfourcc(pb, "MTDT");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2656

avio_wb32(pb, 0x00010012);

2657

avio_wb32(pb, 0x0a);

2658

avio_wb32(pb, 0x55c40000);

2659

avio_wb32(pb, 0x1);

2660

avio_wb32(pb, 0x0);

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

2661

return 0x34;

2662

}

2663

rtp: set the payload type as stream id

Nov 11, 2012

2664

static int mov_write_udta_sdp(AVIOContext *pb, MOVTrack *track)

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2665

{

rtp: set the payload type as stream id

Nov 11, 2012

2666

AVFormatContext *ctx = track->rtp_ctx;

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2667

char buf[1000] = "";

2668

int len;

2669

rtp: set the payload type as stream id

Nov 11, 2012

2670

ff_sdp_write_media(buf, sizeof(buf), ctx->streams[0], track->src_track,

2671

NULL, NULL, 0, 0, ctx);

2672

av_strlcatf(buf, sizeof(buf), "a=control:streamid=%d\r\n", track->track_id);

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2673

len = strlen(buf);

2674

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2675

avio_wb32(pb, len + 24);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2676

ffio_wfourcc(pb, "udta");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2677

avio_wb32(pb, len + 16);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2678

ffio_wfourcc(pb, "hnti");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2679

avio_wb32(pb, len + 8);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2680

ffio_wfourcc(pb, "sdp ");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2681

avio_write(pb, buf, len);

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2682

return len + 24;

2683

}

2684

movenc: add track title to tracks

Jul 31, 2014

2685

static int mov_write_track_metadata(AVIOContext *pb, AVStream *st,

2686

const char *tag, const char *str)

2687

{

2688

int64_t pos = avio_tell(pb);

2689

AVDictionaryEntry *t = av_dict_get(st->metadata, str, NULL, 0);

2690

if (!t || !utf8len(t->value))

2691

return 0;

2692

2693

avio_wb32(pb, 0); /* size */

2694

ffio_wfourcc(pb, tag); /* type */

2695

avio_write(pb, t->value, strlen(t->value)); /* UTF8 string value */

2696

return update_size(pb, pos);

2697

}

2698

2699

static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,

2700

AVStream *st)

2701

{

2702

AVIOContext *pb_buf;

2703

int ret, size;

2704

uint8_t *buf;

2705

mov: Preserve the metadata even when bit-exactness is requested

Jun 15, 2015

2706

if (!st)

movenc: add track title to tracks

Jul 31, 2014

2707

return 0;

2708

2709

ret = avio_open_dyn_buf(&pb_buf);

2710

if (ret < 0)

2711

return ret;

2712

2713

if (mov->mode & MODE_MP4)

2714

mov_write_track_metadata(pb_buf, st, "name", "title");

2715

2716

if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {

2717

avio_wb32(pb, size + 8);

2718

ffio_wfourcc(pb, "udta");

2719

avio_write(pb, buf, size);

2720

}

2721

av_free(buf);

2722

2723

return 0;

2724

}

2725

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2726

static int mov_write_trak_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext *mov,

movenc: Add support for writing fragmented mov files

Jan 5, 2012

2727

MOVTrack *track, AVStream *st)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2728

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2729

int64_t pos = avio_tell(pb);

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

2730

int entry_backup = track->entry;

avformat/movenc: fix DELAY_MOOV

Jan 3, 2015

2731

int chunk_backup = track->chunkCount;

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2732

int ret;

2733

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

2734

/* If we want to have an empty moov, but some samples already have been

2735

* buffered (delay_moov), pretend that no samples have been written yet. */

2736

if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV)

avformat/movenc: fix DELAY_MOOV

Jan 3, 2015

2737

track->chunkCount = track->entry = 0;

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

2738

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2739

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2740

ffio_wfourcc(pb, "trak");

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

2741

mov_write_tkhd_tag(pb, mov, track, st);

Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'

Nov 7, 2014

2742

2743

av_assert2(mov->use_editlist >= 0);

2744

Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'

Jan 3, 2015

2745

if (track->start_dts != AV_NOPTS_VALUE) {

movenc: Allow to request not to use edit lists

Nov 4, 2014

2746

if (mov->use_editlist)

Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'

Nov 8, 2014

2747

            mov_write_edts_tag(pb, mov, track);  // PSP Movies and several other cases require edts box

movenc: Allow to request not to use edit lists

Nov 4, 2014

2748

        else if ((track->entry && track->cluster[0].dts) || track->mode == MODE_PSP || is_clcp_track(track))

2749

av_log(mov->fc, AV_LOG_WARNING,

2750

"Not writing any edit list even though one would have been required\n");

movenc: Add support for writing fragmented mov files

Jan 5, 2012

2751

}

Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'

Nov 7, 2014

2752

movenc: Write QuickTime chapters

May 5, 2010

2753

if (track->tref_tag)

2754

mov_write_tref_tag(pb, track);

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2755

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

2756

if ((ret = mov_write_mdia_tag(s, pb, mov, track)) < 0)

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

2757

return ret;

COSMETICS: Remove all trailing whitespace.

Dec 17, 2005

2758

if (track->mode == MODE_PSP)

movenc: K&R formatting cosmetics

Jul 7, 2013

2759

mov_write_uuid_tag_psp(pb, track); // PSP Movies require this uuid box

Add initial support for RTP hinting in the mov muxer

May 18, 2010

2760

if (track->tag == MKTAG('r','t','p',' '))

rtp: set the payload type as stream id

Nov 11, 2012

2761

mov_write_udta_sdp(pb, track);

mov: Emit the correct tags for clcp tracks

Apr 21, 2014

2762

if (track->mode == MODE_MOV) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2763

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) {

mov: Emit the correct tags for clcp tracks

Apr 21, 2014

2764

double sample_aspect_ratio = av_q2d(st->sample_aspect_ratio);

Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'

Apr 25, 2014

2765

if (st->sample_aspect_ratio.num && 1.0 != sample_aspect_ratio) {

mov: Emit the correct tags for clcp tracks

Apr 21, 2014

2766

mov_write_tapt_tag(pb, track);

2767

}

2768

}

avformat/movenc: dont store invalid tapt atom

Apr 25, 2014

2769

if (is_clcp_track(track) && st->sample_aspect_ratio.num) {

use tapt atom for sample aspect ratio

Feb 25, 2011

2770

mov_write_tapt_tag(pb, track);

mov: Emit the correct tags for clcp tracks

Apr 21, 2014

2771

}

movenc: K&R formatting cosmetics

Jul 7, 2013

2772

}

movenc: add track title to tracks

Jul 31, 2014

2773

mov_write_track_udta_tag(pb, mov, st);

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

2774

track->entry = entry_backup;

avformat/movenc: fix DELAY_MOOV

Jan 3, 2015

2775

track->chunkCount = chunk_backup;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2776

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2777

}

2778

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2779

static int mov_write_iods_tag(AVIOContext *pb, MOVMuxContext *mov)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2780

{

movenc: Rudimentary IODs support.

Oct 4, 2011

2781

int i, has_audio = 0, has_video = 0;

2782

int64_t pos = avio_tell(pb);

2783

int audio_profile = mov->iods_audio_profile;

2784

int video_profile = mov->iods_video_profile;

2785

for (i = 0; i < mov->nb_streams; i++) {

movenc: Include empty tracks in iods when writing fragmented mp4

Nov 3, 2014

2786

if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

2787

has_audio |= mov->tracks[i].par->codec_type == AVMEDIA_TYPE_AUDIO;

2788

has_video |= mov->tracks[i].par->codec_type == AVMEDIA_TYPE_VIDEO;

movenc: Rudimentary IODs support.

Oct 4, 2011

2789

}

2790

}

2791

if (audio_profile < 0)

2792

audio_profile = 0xFF - has_audio;

2793

if (video_profile < 0)

2794

video_profile = 0xFF - has_video;

2795

avio_wb32(pb, 0x0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2796

ffio_wfourcc(pb, "iods");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2797

avio_wb32(pb, 0); /* version & flags */

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2798

put_descr(pb, 0x10, 7);

movenc: Rudimentary IODs support.

Oct 4, 2011

2799

avio_wb16(pb, 0x004f);

2800

avio_w8(pb, 0xff);

2801

avio_w8(pb, 0xff);

2802

avio_w8(pb, audio_profile);

2803

avio_w8(pb, video_profile);

2804

avio_w8(pb, 0xff);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2805

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2806

}

2807

movenc: Add support for writing fragmented mov files

Jan 5, 2012

2808

static int mov_write_trex_tag(AVIOContext *pb, MOVTrack *track)

2809

{

2810

avio_wb32(pb, 0x20); /* size */

2811

ffio_wfourcc(pb, "trex");

2812

avio_wb32(pb, 0); /* version & flags */

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2813

avio_wb32(pb, track->track_id); /* track ID */

movenc: Add support for writing fragmented mov files

Jan 5, 2012

2814

avio_wb32(pb, 1); /* default sample description index */

2815

avio_wb32(pb, 0); /* default sample duration */

2816

avio_wb32(pb, 0); /* default sample size */

2817

avio_wb32(pb, 0); /* default sample flags */

2818

return 0;

2819

}

2820

2821

static int mov_write_mvex_tag(AVIOContext *pb, MOVMuxContext *mov)

2822

{

2823

int64_t pos = avio_tell(pb);

2824

int i;

2825

avio_wb32(pb, 0x0); /* size */

2826

ffio_wfourcc(pb, "mvex");

2827

for (i = 0; i < mov->nb_streams; i++)

2828

mov_write_trex_tag(pb, &mov->tracks[i]);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2829

return update_size(pb, pos);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

2830

}

2831

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2832

static int mov_write_mvhd_tag(AVIOContext *pb, MOVMuxContext *mov)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2833

{

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2834

int max_track_id = 1, i;

avformat/movenc: move variable to a more local block

Jan 10, 2015

2835

int64_t max_track_len = 0;

use 64bit atom version if needed

Mar 26, 2006

2836

int version;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2837

movenc: K&R formatting cosmetics

Jul 7, 2013

2838

for (i = 0; i < mov->nb_streams; i++) {

mov: Compute max duration among the tracks with a timescale

Aug 19, 2013

2839

if (mov->tracks[i].entry > 0 && mov->tracks[i].timescale) {

avformat/movenc: move variable to a more local block

Jan 10, 2015

2840

int64_t max_track_len_temp = av_rescale_rnd(mov->tracks[i].track_duration,

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2841

MOV_TIMESCALE,

2842

mov->tracks[i].timescale,

2843

AV_ROUND_UP);

2844

if (max_track_len < max_track_len_temp)

2845

max_track_len = max_track_len_temp;

2846

if (max_track_id < mov->tracks[i].track_id)

2847

max_track_id = mov->tracks[i].track_id;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2848

}

2849

}

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

2850

/* If using delay_moov, make sure the output is the same as if no

2851

* samples had been written yet. */

2852

if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {

2853

max_track_len = 0;

2854

max_track_id = 1;

2855

}

use 64bit atom version if needed

Mar 26, 2006

2856

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2857

version = max_track_len < UINT32_MAX ? 0 : 1;

avformat/movenc: workaround bug in "PathScale EKOPath(tm) Compiler Su…

Jan 10, 2015

2858

avio_wb32(pb, version == 1 ? 120 : 108); /* size */

2859

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2860

ffio_wfourcc(pb, "mvhd");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2861

avio_w8(pb, version);

2862

avio_wb24(pb, 0); /* flags */

use 64bit atom version if needed

Mar 26, 2006

2863

if (version == 1) {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2864

avio_wb64(pb, mov->time);

2865

avio_wb64(pb, mov->time);

use 64bit atom version if needed

Mar 26, 2006

2866

} else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2867

avio_wb32(pb, mov->time); /* creation time */

2868

avio_wb32(pb, mov->time); /* modification time */

use 64bit atom version if needed

Mar 26, 2006

2869

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2870

avio_wb32(pb, MOV_TIMESCALE);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2871

    (version == 1) ? avio_wb64(pb, max_track_len) : avio_wb32(pb, max_track_len); /* duration of longest track */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2872

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2873

avio_wb32(pb, 0x00010000); /* reserved (preferred rate) 1.0 = normal */

2874

avio_wb16(pb, 0x0100); /* reserved (preferred volume) 1.0 = normal */

2875

avio_wb16(pb, 0); /* reserved */

2876

avio_wb32(pb, 0); /* reserved */

2877

avio_wb32(pb, 0); /* reserved */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2878

2879

/* Matrix structure */

movenc: write track header transformation matrix depending on "rotate…

Jul 13, 2012

2880

write_matrix(pb, 1, 0, 0, 1, 0, 0);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2881

2882

avio_wb32(pb, 0); /* reserved (preview time) */

2883

avio_wb32(pb, 0); /* reserved (preview duration) */

2884

avio_wb32(pb, 0); /* reserved (poster time) */

2885

avio_wb32(pb, 0); /* reserved (selection time) */

2886

avio_wb32(pb, 0); /* reserved (selection duration) */

2887

avio_wb32(pb, 0); /* reserved (current time) */

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2888

avio_wb32(pb, max_track_id + 1); /* Next track id */

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

2889

return 0x6c;

2890

}

2891

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2892

static int mov_write_itunes_hdlr_tag(AVIOContext *pb, MOVMuxContext *mov,

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2893

AVFormatContext *s)

2894

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2895

avio_wb32(pb, 33); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2896

ffio_wfourcc(pb, "hdlr");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2897

avio_wb32(pb, 0);

2898

avio_wb32(pb, 0);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2899

ffio_wfourcc(pb, "mdir");

2900

ffio_wfourcc(pb, "appl");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2901

avio_wb32(pb, 0);

2902

avio_wb32(pb, 0);

2903

avio_w8(pb, 0);

Predicting the size of the hdlr, string data and trkn tags in the MOV…

Apr 12, 2010

2904

return 33;

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2905

}

2906

2907

/* helper function to write a data tag with the specified string as data */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

2908

static int mov_write_string_data_tag(AVIOContext *pb, const char *data, int lang, int long_style)

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2909

{

movenc: K&R formatting cosmetics

Jul 7, 2013

2910

if (long_style) {

Predicting the size of the hdlr, string data and trkn tags in the MOV…

Apr 12, 2010

2911

int size = 16 + strlen(data);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2912

avio_wb32(pb, size); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2913

ffio_wfourcc(pb, "data");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2914

avio_wb32(pb, 1);

2915

avio_wb32(pb, 0);

2916

avio_write(pb, data, strlen(data));

Predicting the size of the hdlr, string data and trkn tags in the MOV…

Apr 12, 2010

2917

return size;

movenc: K&R formatting cosmetics

Jul 7, 2013

2918

} else {

Fix encoder metadata string langcode in mov muxer

Mar 9, 2010

2919

if (!lang)

2920

lang = ff_mov_iso639_to_lang("und", 1);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2921

avio_wb16(pb, strlen(data)); /* string length */

2922

avio_wb16(pb, lang);

2923

avio_write(pb, data, strlen(data));

simplify meta tag writing code

May 18, 2006

2924

return strlen(data) + 4;

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2925

}

2926

}

2927

movenc: K&R formatting cosmetics

Jul 7, 2013

2928

static int mov_write_string_tag(AVIOContext *pb, const char *name,

2929

const char *value, int lang, int long_style)

2930

{

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2931

int size = 0;

cosmetics, remove whitespaces before and after parenthesis

Feb 6, 2008

2932

if (value && value[0]) {

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

2933

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

2934

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

2935

ffio_wfourcc(pb, name);

movenc: add muxing of language along with metadata tags when available

Feb 26, 2009

2936

mov_write_string_data_tag(pb, value, lang, long_style);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

2937

size = update_size(pb, pos);

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2938

}

2939

return size;

2940

}

2941

movenc: Factorize a function for finding a metadata entry and the ass…

May 18, 2016

2942

static AVDictionaryEntry *get_metadata_lang(AVFormatContext *s,

2943

const char *tag, int *lang)

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2944

{

movenc: Factorize a function for finding a metadata entry and the ass…

May 18, 2016

2945

int l, len, len2;

Remove all uses of now deprecated metadata functions.

May 22, 2011

2946

AVDictionaryEntry *t, *t2 = NULL;

movenc: add muxing of language along with metadata tags when available

Feb 26, 2009

2947

char tag2[16];

use new metadata API in mov muxer

Feb 26, 2009

2948

movenc: Factorize a function for finding a metadata entry and the ass…

May 18, 2016

2949

*lang = 0;

2950

Remove all uses of now deprecated metadata functions.

May 22, 2011

2951

if (!(t = av_dict_get(s->metadata, tag, NULL, 0)))

movenc: Factorize a function for finding a metadata entry and the ass…

May 18, 2016

2952

return NULL;

use new metadata API in mov muxer

Feb 26, 2009

2953

movenc: add muxing of language along with metadata tags when available

Feb 26, 2009

2954

len = strlen(t->key);

2955

snprintf(tag2, sizeof(tag2), "%s-", tag);

Remove all uses of now deprecated metadata functions.

May 22, 2011

2956

while ((t2 = av_dict_get(s->metadata, tag2, t2, AV_DICT_IGNORE_SUFFIX))) {

movenc: add muxing of language along with metadata tags when available

Feb 26, 2009

2957

len2 = strlen(t2->key);

movenc: K&R formatting cosmetics

Jul 7, 2013

2958

if (len2 == len + 4 && !strcmp(t->value, t2->value)

2959

&& (l = ff_mov_iso639_to_lang(&t2->key[len2 - 3], 1)) >= 0) {

movenc: Factorize a function for finding a metadata entry and the ass…

May 18, 2016

2960

*lang = l;

2961

return t;

movenc: add muxing of language along with metadata tags when available

Feb 26, 2009

2962

}

2963

}

movenc: Factorize a function for finding a metadata entry and the ass…

May 18, 2016

2964

return t;

2965

}

2966

2967

static int mov_write_string_metadata(AVFormatContext *s, AVIOContext *pb,

2968

const char *name, const char *tag,

2969

int long_style)

2970

{

2971

int lang;

2972

AVDictionaryEntry *t = get_metadata_lang(s, tag, &lang);

2973

if (!t)

2974

return 0;

movenc: add muxing of language along with metadata tags when available

Feb 26, 2009

2975

return mov_write_string_tag(pb, name, t->value, lang, long_style);

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

2976

}

2977

movenc: support for itunes tempo tag

Aug 24, 2012

2978

/* iTunes bpm number */

2979

static int mov_write_tmpo_tag(AVIOContext *pb, AVFormatContext *s)

2980

{

2981

AVDictionaryEntry *t = av_dict_get(s->metadata, "tmpo", NULL, 0);

2982

int size = 0, tmpo = t ? atoi(t->value) : 0;

2983

if (tmpo) {

2984

size = 26;

2985

avio_wb32(pb, size);

2986

ffio_wfourcc(pb, "tmpo");

2987

avio_wb32(pb, size-8); /* size */

2988

ffio_wfourcc(pb, "data");

2989

avio_wb32(pb, 0x15); //type specifier

2990

avio_wb32(pb, 0);

2991

avio_wb16(pb, tmpo); // data

2992

}

2993

return size;

2994

}

2995

movenc: Write 'loci' geotag metadata for 3gp and mp4

May 18, 2016

2996

/* 3GPP TS 26.244 */

2997

static int mov_write_loci_tag(AVFormatContext *s, AVIOContext *pb)

2998

{

2999

int lang;

3000

int64_t pos = avio_tell(pb);

3001

double latitude, longitude, altitude;

3002

int32_t latitude_fix, longitude_fix, altitude_fix;

3003

AVDictionaryEntry *t = get_metadata_lang(s, "location", &lang);

3004

const char *ptr, *place = "";

3005

char *end;

movenc: mark astronomical_body const string as static

Jun 25, 2016

3006

static const char *astronomical_body = "earth";

movenc: Write 'loci' geotag metadata for 3gp and mp4

May 18, 2016

3007

if (!t)

3008

return 0;

3009

3010

ptr = t->value;

3011

longitude = strtod(ptr, &end);

3012

if (end == ptr) {

3013

av_log(s, AV_LOG_WARNING, "malformed location metadata\n");

3014

return 0;

3015

}

3016

ptr = end;

3017

latitude = strtod(ptr, &end);

3018

if (end == ptr) {

3019

av_log(s, AV_LOG_WARNING, "malformed location metadata\n");

3020

return 0;

3021

}

3022

ptr = end;

3023

altitude = strtod(ptr, &end);

3024

/* If no altitude was present, the default 0 should be fine */

3025

if (*end == '/')

3026

place = end + 1;

3027

3028

latitude_fix = (int32_t) ((1 << 16) * latitude);

3029

longitude_fix = (int32_t) ((1 << 16) * longitude);

3030

altitude_fix = (int32_t) ((1 << 16) * altitude);

3031

3032

avio_wb32(pb, 0); /* size */

3033

ffio_wfourcc(pb, "loci"); /* type */

3034

avio_wb32(pb, 0); /* version + flags */

3035

avio_wb16(pb, lang);

3036

avio_write(pb, place, strlen(place) + 1);

3037

    avio_w8(pb, 0);           /* role of place (0 == shooting location, 1 == real location, 2 == fictional location) */

3038

avio_wb32(pb, latitude_fix);

3039

avio_wb32(pb, longitude_fix);

3040

avio_wb32(pb, altitude_fix);

3041

avio_write(pb, astronomical_body, strlen(astronomical_body) + 1);

3042

avio_w8(pb, 0); /* additional notes, null terminated string */

3043

3044

return update_size(pb, pos);

3045

}

3046

lavf/movenc: Write disc number and total number of discs as part of m…

Aug 1, 2013

3047

/* iTunes track or disc number */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3048

static int mov_write_trkn_tag(AVIOContext *pb, MOVMuxContext *mov,

lavf/movenc: Write disc number and total number of discs as part of m…

Aug 1, 2013

3049

AVFormatContext *s, int disc)

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

3050

{

lavf/movenc: Write disc number and total number of discs as part of m…

Aug 1, 2013

3051

AVDictionaryEntry *t = av_dict_get(s->metadata,

3052

disc ? "disc" : "track",

3053

NULL, 0);

use new metadata API in mov muxer

Feb 26, 2009

3054

int size = 0, track = t ? atoi(t->value) : 0;

3055

if (track) {

lavf/movenc: Write total number of tracks as part of metadata.

Aug 1, 2013

3056

int tracks = 0;

3057

char *slash = strchr(t->value, '/');

3058

if (slash)

3059

tracks = atoi(slash + 1);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3060

avio_wb32(pb, 32); /* size */

lavf/movenc: Write disc number and total number of discs as part of m…

Aug 1, 2013

3061

ffio_wfourcc(pb, disc ? "disk" : "trkn");

movenc: K&R formatting cosmetics

Jul 7, 2013

3062

avio_wb32(pb, 24); /* size */

3063

ffio_wfourcc(pb, "data");

3064

avio_wb32(pb, 0); // 8 bytes empty

3065

avio_wb32(pb, 0);

3066

avio_wb16(pb, 0); // empty

lavf/movenc: Write disc number and total number of discs as part of m…

Aug 1, 2013

3067

avio_wb16(pb, track); // track / disc number

3068

avio_wb16(pb, tracks); // total track / disc number

movenc: K&R formatting cosmetics

Jul 7, 2013

3069

avio_wb16(pb, 0); // empty

Predicting the size of the hdlr, string data and trkn tags in the MOV…

Apr 12, 2010

3070

size = 32;

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

3071

}

3072

return size;

3073

}

3074

movenc: add more metadata types

Aug 21, 2012

3075

static int mov_write_int8_metadata(AVFormatContext *s, AVIOContext *pb,

3076

const char *name, const char *tag,

3077

int len)

3078

{

3079

AVDictionaryEntry *t = NULL;

3080

uint8_t num;

lavf/movenc: fix writing of some iTunes metadata tag

Jun 29, 2013

3081

int size = 24 + len;

3082

3083

if (len != 1 && len != 4)

3084

return -1;

movenc: add more metadata types

Aug 21, 2012

3085

3086

if (!(t = av_dict_get(s->metadata, tag, NULL, 0)))

3087

return 0;

movenc: remove unneeded check

Nov 3, 2012

3088

num = atoi(t->value);

movenc: add more metadata types

Aug 21, 2012

3089

lavf/movenc: fix writing of some iTunes metadata tag

Jun 29, 2013

3090

avio_wb32(pb, size);

movenc: add more metadata types

Aug 21, 2012

3091

ffio_wfourcc(pb, name);

lavf/movenc: fix writing of some iTunes metadata tag

Jun 29, 2013

3092

avio_wb32(pb, size - 8);

3093

ffio_wfourcc(pb, "data");

3094

avio_wb32(pb, 0x15);

3095

avio_wb32(pb, 0);

movenc: add more metadata types

Aug 21, 2012

3096

if (len==4) avio_wb32(pb, num);

3097

else avio_w8 (pb, num);

lavf/movenc: fix writing of some iTunes metadata tag

Jun 29, 2013

3098

3099

return size;

movenc: add more metadata types

Aug 21, 2012

3100

}

3101

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

3102

/* iTunes meta data list */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3103

static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov,

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

3104

AVFormatContext *s)

3105

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

3106

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3107

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3108

ffio_wfourcc(pb, "ilst");

use new metadata API in mov muxer

Feb 26, 2009

3109

mov_write_string_metadata(s, pb, "\251nam", "title" , 1);

change author metadata to artist in mov de/muxer

May 23, 2010

3110

mov_write_string_metadata(s, pb, "\251ART", "artist" , 1);

Add support for these widely-used iTunes metadata fields: Album Artist,

Jan 4, 2010

3111

mov_write_string_metadata(s, pb, "aART", "album_artist", 1);

MOV: Fix writing \251wrt metadata (r20453 only fixed the demuxer)

Nov 23, 2009

3112

mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1);

use new metadata API in mov muxer

Feb 26, 2009

3113

mov_write_string_metadata(s, pb, "\251alb", "album" , 1);

Add a list of generic tags and change demuxers to follow it.

Feb 1, 2010

3114

mov_write_string_metadata(s, pb, "\251day", "date" , 1);

mov: Preserve the metadata even when bit-exactness is requested

Jun 15, 2015

3115

if (!mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1)) {

3116

if (!(s->flags & AVFMT_FLAG_BITEXACT))

3117

mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1);

3118

}

use new metadata API in mov muxer

Feb 26, 2009

3119

mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1);

3120

mov_write_string_metadata(s, pb, "\251gen", "genre" , 1);

3121

mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1);

Add support for these widely-used iTunes metadata fields: Album Artist,

Jan 4, 2010

3122

mov_write_string_metadata(s, pb, "\251grp", "grouping" , 1);

3123

mov_write_string_metadata(s, pb, "\251lyr", "lyrics" , 1);

MOV: Add several iTunes metadata tags

Nov 23, 2009

3124

mov_write_string_metadata(s, pb, "desc", "description",1);

3125

mov_write_string_metadata(s, pb, "ldes", "synopsis" , 1);

3126

mov_write_string_metadata(s, pb, "tvsh", "show" , 1);

3127

mov_write_string_metadata(s, pb, "tven", "episode_id",1);

3128

mov_write_string_metadata(s, pb, "tvnn", "network" , 1);

movenc: add more metadata types

Aug 21, 2012

3129

mov_write_int8_metadata (s, pb, "tves", "episode_sort",4);

3130

mov_write_int8_metadata (s, pb, "tvsn", "season_number",4);

3131

mov_write_int8_metadata (s, pb, "stik", "media_type",1);

3132

mov_write_int8_metadata (s, pb, "hdvd", "hd_video", 1);

3133

mov_write_int8_metadata (s, pb, "pgap", "gapless_playback",1);

avformat/movenc: encode compilation metadata

Mar 15, 2014

3134

mov_write_int8_metadata (s, pb, "cpil", "compilation", 1);

lavf/movenc: Write disc number and total number of discs as part of m…

Aug 1, 2013

3135

mov_write_trkn_tag(pb, mov, s, 0); // track number

3136

mov_write_trkn_tag(pb, mov, s, 1); // disc number

movenc: support for itunes tempo tag

Aug 24, 2012

3137

mov_write_tmpo_tag(pb, s);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3138

return update_size(pb, pos);

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

3139

}

3140

avformat/movenc: add option to use keys/mdta atoms for metadata

Jun 22, 2016

3141

static int mov_write_mdta_hdlr_tag(AVIOContext *pb, MOVMuxContext *mov,

3142

AVFormatContext *s)

3143

{

3144

avio_wb32(pb, 33); /* size */

3145

ffio_wfourcc(pb, "hdlr");

3146

avio_wb32(pb, 0);

3147

avio_wb32(pb, 0);

3148

ffio_wfourcc(pb, "mdta");

3149

avio_wb32(pb, 0);

3150

avio_wb32(pb, 0);

3151

avio_wb32(pb, 0);

3152

avio_w8(pb, 0);

3153

return 33;

3154

}

3155

3156

static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov,

3157

AVFormatContext *s)

3158

{

3159

AVDictionaryEntry *t = NULL;

3160

int64_t pos = avio_tell(pb);

3161

int64_t curpos, entry_pos;

3162

int count = 0;

3163

3164

avio_wb32(pb, 0); /* size */

3165

ffio_wfourcc(pb, "keys");

3166

avio_wb32(pb, 0);

3167

entry_pos = avio_tell(pb);

3168

avio_wb32(pb, 0); /* entry count */

3169

3170

while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) {

3171

avio_wb32(pb, strlen(t->key) + 8);

3172

ffio_wfourcc(pb, "mdta");

3173

avio_write(pb, t->key, strlen(t->key));

3174

count += 1;

3175

}

3176

curpos = avio_tell(pb);

3177

avio_seek(pb, entry_pos, SEEK_SET);

3178

avio_wb32(pb, count); // rewrite entry count

3179

avio_seek(pb, curpos, SEEK_SET);

3180

3181

return update_size(pb, pos);

3182

}

3183

3184

static int mov_write_mdta_ilst_tag(AVIOContext *pb, MOVMuxContext *mov,

3185

AVFormatContext *s)

3186

{

3187

AVDictionaryEntry *t = NULL;

3188

int64_t pos = avio_tell(pb);

3189

int count = 1; /* keys are 1-index based */

3190

3191

avio_wb32(pb, 0); /* size */

3192

ffio_wfourcc(pb, "ilst");

3193

3194

while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) {

3195

int64_t entry_pos = avio_tell(pb);

3196

avio_wb32(pb, 0); /* size */

3197

avio_wb32(pb, count); /* key */

3198

mov_write_string_data_tag(pb, t->value, 0, 1);

3199

update_size(pb, entry_pos);

3200

count += 1;

3201

}

3202

return update_size(pb, pos);

3203

}

3204

3205

/* meta data tags */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3206

static int mov_write_meta_tag(AVIOContext *pb, MOVMuxContext *mov,

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

3207

AVFormatContext *s)

3208

{

3209

int size = 0;

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

3210

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3211

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3212

ffio_wfourcc(pb, "meta");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3213

avio_wb32(pb, 0);

avformat/movenc: add option to use keys/mdta atoms for metadata

Jun 22, 2016

3214

if (mov->flags & FF_MOV_FLAG_USE_MDTA) {

3215

mov_write_mdta_hdlr_tag(pb, mov, s);

3216

mov_write_mdta_keys_tag(pb, mov, s);

3217

mov_write_mdta_ilst_tag(pb, mov, s);

3218

}

3219

else {

3220

/* iTunes metadata tag */

3221

mov_write_itunes_hdlr_tag(pb, mov, s);

3222

mov_write_ilst_tag(pb, mov, s);

3223

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3224

size = update_size(pb, pos);

iTunes metadata encoding support patch by (Patrice Bensoussan <patric…

Aug 14, 2004

3225

return size;

3226

}

COSMETICS: Remove all trailing whitespace.

Dec 17, 2005

3227

avformat/movenc: XMP metadata support.

Aug 6, 2014

3228

static int mov_write_raw_metadata_tag(AVFormatContext *s, AVIOContext *pb,

3229

const char *name, const char *key)

3230

{

3231

int len;

3232

AVDictionaryEntry *t;

3233

3234

if (!(t = av_dict_get(s->metadata, key, NULL, 0)))

3235

return 0;

3236

3237

len = strlen(t->value);

3238

if (len > 0) {

3239

int size = len + 8;

3240

avio_wb32(pb, size);

3241

ffio_wfourcc(pb, name);

3242

avio_write(pb, t->value, len);

3243

return size;

3244

}

3245

return 0;

3246

}

3247

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3248

static int ascii_to_wc(AVIOContext *pb, const uint8_t *b)

move utf8 code before udta func, will be used by 3gp tags

Jun 11, 2008

3249

{

3250

int val;

movenc: K&R formatting cosmetics

Jul 7, 2013

3251

while (*b) {

move utf8 code before udta func, will be used by 3gp tags

Jun 11, 2008

3252

GET_UTF8(val, *b++, return -1;)

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3253

avio_wb16(pb, val);

move utf8 code before udta func, will be used by 3gp tags

Jun 11, 2008

3254

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3255

avio_wb16(pb, 0x00);

move utf8 code before udta func, will be used by 3gp tags

Jun 11, 2008

3256

return 0;

3257

}

3258

3259

static uint16_t language_code(const char *str)

3260

{

movenc: K&R formatting cosmetics

Jul 7, 2013

3261

return (((str[0] - 0x60) & 0x1F) << 10) +

3262

(((str[1] - 0x60) & 0x1F) << 5) +

3263

(( str[2] - 0x60) & 0x1F);

move utf8 code before udta func, will be used by 3gp tags

Jun 11, 2008

3264

}

3265

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3266

static int mov_write_3gp_udta_tag(AVIOContext *pb, AVFormatContext *s,

support for 3gp metadata

Jun 11, 2008

3267

const char *tag, const char *str)

3268

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

3269

int64_t pos = avio_tell(pb);

Remove all uses of now deprecated metadata functions.

May 22, 2011

3270

AVDictionaryEntry *t = av_dict_get(s->metadata, str, NULL, 0);

use new metadata API in mov muxer

Feb 26, 2009

3271

if (!t || !utf8len(t->value))

support for 3gp metadata

Jun 11, 2008

3272

return 0;

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3273

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3274

ffio_wfourcc(pb, tag); /* type */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3275

avio_wb32(pb, 0); /* version + flags */

support for 3gp metadata

Jun 11, 2008

3276

if (!strcmp(tag, "yrrc"))

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3277

avio_wb16(pb, atoi(t->value));

support for 3gp metadata

Jun 11, 2008

3278

else {

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3279

avio_wb16(pb, language_code("eng")); /* language */

movenc: K&R formatting cosmetics

Jul 7, 2013

3280

avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */

use new metadata API in mov muxer

Feb 26, 2009

3281

if (!strcmp(tag, "albm") &&

Remove all uses of now deprecated metadata functions.

May 22, 2011

3282

(t = av_dict_get(s->metadata, "track", NULL, 0)))

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3283

avio_w8(pb, atoi(t->value));

support for 3gp metadata

Jun 11, 2008

3284

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3285

return update_size(pb, pos);

support for 3gp metadata

Jun 11, 2008

3286

}

3287

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3288

static int mov_write_chpl_tag(AVIOContext *pb, AVFormatContext *s)

movenc: Write nero chapters

Apr 21, 2010

3289

{

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

3290

int64_t pos = avio_tell(pb);

movenc: Write nero chapters

Apr 21, 2010

3291

int i, nb_chapters = FFMIN(s->nb_chapters, 255);

3292

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3293

avio_wb32(pb, 0); // size

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3294

ffio_wfourcc(pb, "chpl");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3295

avio_wb32(pb, 0x01000000); // version + flags

3296

avio_wb32(pb, 0); // unknown

3297

avio_w8(pb, nb_chapters);

movenc: Write nero chapters

Apr 21, 2010

3298

3299

for (i = 0; i < nb_chapters; i++) {

3300

AVChapter *c = s->chapters[i];

Remove all uses of now deprecated metadata functions.

May 22, 2011

3301

AVDictionaryEntry *t;

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3302

avio_wb64(pb, av_rescale_q(c->start, c->time_base, (AVRational){1,10000000}));

movenc: Write nero chapters

Apr 21, 2010

3303

Remove all uses of now deprecated metadata functions.

May 22, 2011

3304

if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {

movenc: Write nero chapters

Apr 21, 2010

3305

int len = FFMIN(strlen(t->value), 255);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3306

avio_w8(pb, len);

3307

avio_write(pb, t->value, len);

movenc: Write nero chapters

Apr 21, 2010

3308

} else

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3309

avio_w8(pb, 0);

movenc: Write nero chapters

Apr 21, 2010

3310

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3311

return update_size(pb, pos);

movenc: Write nero chapters

Apr 21, 2010

3312

}

3313

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3314

static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov,

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

3315

AVFormatContext *s)

3316

{

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3317

AVIOContext *pb_buf;

avformat/movenc: only ommit encoder tag of the metadata for bitexact …

Mar 16, 2014

3318

int ret, size;

use new metadata API in mov muxer

Feb 26, 2009

3319

uint8_t *buf;

Prevent mov muxer from writing empty udta atoms.

Oct 24, 2007

3320

avio: avio_ prefix for url_open_dyn_buf

Mar 17, 2011

3321

ret = avio_open_dyn_buf(&pb_buf);

movenc: K&R formatting cosmetics

Jul 7, 2013

3322

if (ret < 0)

use new metadata API in mov muxer

Feb 26, 2009

3323

return ret;

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

3324

movenc: indent cosemtics

Jan 14, 2012

3325

if (mov->mode & MODE_3GP) {

3326

mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist");

3327

mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");

3328

mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");

3329

mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");

3330

mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");

3331

mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");

3332

mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");

3333

mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");

movenc: Write 'loci' geotag metadata for 3gp and mp4

May 18, 2016

3334

mov_write_loci_tag(s, pb_buf);

avformat/movenc: add option to use keys/mdta atoms for metadata

Jun 22, 2016

3335

    } else if (mov->mode == MODE_MOV && !(mov->flags & FF_MOV_FLAG_USE_MDTA)) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4

movenc: K&R formatting cosmetics

Jul 7, 2013

3336

mov_write_string_metadata(s, pb_buf, "\251ART", "artist", 0);

3337

mov_write_string_metadata(s, pb_buf, "\251nam", "title", 0);

3338

mov_write_string_metadata(s, pb_buf, "\251aut", "author", 0);

3339

mov_write_string_metadata(s, pb_buf, "\251alb", "album", 0);

3340

mov_write_string_metadata(s, pb_buf, "\251day", "date", 0);

3341

mov_write_string_metadata(s, pb_buf, "\251swr", "encoder", 0);

movenc: Addtion of \251cmt field to udta

Jul 9, 2012

3342

// currently ignored by mov.c

movenc: K&R formatting cosmetics

Jul 7, 2013

3343

mov_write_string_metadata(s, pb_buf, "\251des", "comment", 0);

movenc: Addtion of \251cmt field to udta

Jul 9, 2012

3344

// add support for libquicktime, this atom is also actually read by mov.c

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

3345

mov_write_string_metadata(s, pb_buf, "\251cmt", "comment", 0);

movenc: K&R formatting cosmetics

Jul 7, 2013

3346

mov_write_string_metadata(s, pb_buf, "\251gen", "genre", 0);

3347

mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright", 0);

movenc: Write the make and model metadata keys for mov style files

Nov 21, 2014

3348

mov_write_string_metadata(s, pb_buf, "\251mak", "make", 0);

3349

mov_write_string_metadata(s, pb_buf, "\251mod", "model", 0);

avformat/movenc: Add loction/xyz support to allow copying data betwee…

May 30, 2015

3350

mov_write_string_metadata(s, pb_buf, "\251xyz", "location", 0);

avformat/movenc: XMP metadata support.

Aug 6, 2014

3351

mov_write_raw_metadata_tag(s, pb_buf, "XMP_", "xmp");

movenc: indent cosemtics

Jan 14, 2012

3352

} else {

3353

/* iTunes meta data */

3354

mov_write_meta_tag(pb_buf, mov, s);

movenc: Write 'loci' geotag metadata for 3gp and mp4

May 18, 2016

3355

mov_write_loci_tag(s, pb_buf);

movenc: indent cosemtics

Jan 14, 2012

3356

}

use new metadata API in mov muxer

Feb 26, 2009

3357

movenc: Add option to disable nero chapters

Aug 4, 2014

3358

if (s->nb_chapters && !(mov->flags & FF_MOV_FLAG_DISABLE_CHPL))

movenc: indent cosemtics

Jan 14, 2012

3359

mov_write_chpl_tag(pb_buf, s);

movenc: Write nero chapters

Apr 21, 2010

3360

avio: avio_ prefix for url_close_dyn_buf

Mar 17, 2011

3361

if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {

movenc: K&R formatting cosmetics

Jul 7, 2013

3362

avio_wb32(pb, size + 8);

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3363

ffio_wfourcc(pb, "udta");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3364

avio_write(pb, buf, size);

Prevent mov muxer from writing empty udta atoms.

Oct 24, 2007

3365

}

movenc: Free the buffer returned by url_close_dyn_buffer, regardless …

Jul 20, 2010

3366

av_free(buf);

Prevent mov muxer from writing empty udta atoms.

Oct 24, 2007

3367

3368

return 0;

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

3369

}

3370

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3371

static void mov_write_psp_udta_tag(AVIOContext *pb,

movenc: K&R formatting cosmetics

Jul 7, 2013

3372

const char *str, const char *lang, int type)

factorize psp metadata

Jun 11, 2008

3373

{

movenc: K&R formatting cosmetics

Jul 7, 2013

3374

int len = utf8len(str) + 1;

3375

if (len <= 0)

simplify

Jun 11, 2008

3376

return;

movenc: K&R formatting cosmetics

Jul 7, 2013

3377

avio_wb16(pb, len * 2 + 10); /* size */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3378

avio_wb32(pb, type); /* type */

3379

avio_wb16(pb, language_code(lang)); /* language */

3380

avio_wb16(pb, 0x01); /* ? */

factorize psp metadata

Jun 11, 2008

3381

ascii_to_wc(pb, str);

3382

}

3383

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3384

static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s)

Fix for title field in PSP compatible mp4 files. Patch by

Jan 24, 2006

3385

{

Remove all uses of now deprecated metadata functions.

May 22, 2011

3386

AVDictionaryEntry *title = av_dict_get(s->metadata, "title", NULL, 0);

Remove offset_t typedef and use int64_t directly instead.

Oct 3, 2008

3387

int64_t pos, pos2;

Fix for title field in PSP compatible mp4 files. Patch by

Jan 24, 2006

3388

use new metadata API in mov muxer

Feb 26, 2009

3389

if (title) {

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

3390

pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3391

avio_wb32(pb, 0); /* size placeholder*/

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3392

ffio_wfourcc(pb, "uuid");

3393

ffio_wfourcc(pb, "USMT");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3394

avio_wb32(pb, 0x21d24fce); /* 96 bit UUID */

3395

avio_wb32(pb, 0xbb88695c);

3396

avio_wb32(pb, 0xfac9c740);

Fix for title field in PSP compatible mp4 files. Patch by

Jan 24, 2006

3397

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

3398

pos2 = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3399

avio_wb32(pb, 0); /* size placeholder*/

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3400

ffio_wfourcc(pb, "MTDT");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3401

avio_wb16(pb, 4);

Fix for title field in PSP compatible mp4 files. Patch by

Jan 24, 2006

3402

fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table…

May 19, 2006

3403

// ?

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3404

avio_wb16(pb, 0x0C); /* size */

3405

avio_wb32(pb, 0x0B); /* type */

3406

avio_wb16(pb, language_code("und")); /* language */

3407

avio_wb16(pb, 0x0); /* ? */

3408

avio_wb16(pb, 0x021C); /* data */

fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table…

May 19, 2006

3409

avformat/movenc: Drop redundant bit exact field from context

Jul 18, 2015

3410

if (!(s->flags & AVFMT_FLAG_BITEXACT))

avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusm…

Mar 16, 2014

3411

mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04);

use new metadata API in mov muxer

Feb 26, 2009

3412

mov_write_psp_udta_tag(pb, title->value, "eng", 0x01);

simplify

Jun 11, 2008

3413

mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03);

3414

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3415

update_size(pb, pos2);

3416

return update_size(pb, pos);

Fix for title field in PSP compatible mp4 files. Patch by

Jan 24, 2006

3417

}

3418

simplify

Jun 11, 2008

3419

return 0;

Fix for title field in PSP compatible mp4 files. Patch by

Jan 24, 2006

3420

}

3421

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

3422

static void build_chunks(MOVTrack *trk)

3423

{

3424

int i;

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

3425

MOVIentry *chunk = &trk->cluster[0];

movenc: Remove unneeded chunkSize field from MOVIentry

Nov 29, 2011

3426

uint64_t chunkSize = chunk->size;

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

3427

chunk->chunkNum = 1;

Merge remote-tracking branch 'qatar/master'

Feb 23, 2012

3428

if (trk->chunkCount)

3429

return;

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

3430

trk->chunkCount = 1;

3431

for (i = 1; i<trk->entry; i++){

3432

if (chunk->pos + chunkSize == trk->cluster[i].pos &&

movenc: Decrease default chunk merge limit to 1mb.

Jan 23, 2012

3433

chunkSize + trk->cluster[i].size < (1<<20)){

movenc: Remove unneeded chunkSize field from MOVIentry

Nov 29, 2011

3434

chunkSize += trk->cluster[i].size;

Merge remote-tracking branch 'qatar/master'

Jan 31, 2012

3435

chunk->samples_in_chunk += trk->cluster[i].entries;

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

3436

} else {

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

3437

trk->cluster[i].chunkNum = chunk->chunkNum+1;

3438

chunk=&trk->cluster[i];

movenc: Remove unneeded chunkSize field from MOVIentry

Nov 29, 2011

3439

chunkSize = chunk->size;

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

3440

trk->chunkCount++;

3441

}

3442

}

3443

}

3444

avformat/movenc: added ability to use original stream ids as track id…

Aug 31, 2016

3445

/**

3446

* Assign track ids. If option "use_stream_ids_as_track_ids" is set,

3447

* the stream ids are used as track ids.

3448

*

3449

* This assumes mov->tracks and s->streams are in the same order and

3450

* there are no gaps in either of them (so mov->tracks[n] refers to

3451

* s->streams[n]).

3452

*

3453

* As an exception, there can be more entries in

3454

* s->streams than in mov->tracks, in which case new track ids are

3455

* generated (starting after the largest found stream id).

3456

*/

3457

static int mov_setup_track_ids(MOVMuxContext *mov, AVFormatContext *s)

3458

{

3459

int i;

3460

3461

if (mov->track_ids_ok)

3462

return 0;

3463

3464

if (mov->use_stream_ids_as_track_ids) {

3465

int next_generated_track_id = 0;

3466

for (i = 0; i < s->nb_streams; i++) {

3467

if (s->streams[i]->id > next_generated_track_id)

3468

next_generated_track_id = s->streams[i]->id;

3469

}

3470

3471

for (i = 0; i < mov->nb_streams; i++) {

3472

if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))

3473

continue;

3474

3475

            mov->tracks[i].track_id = i >= s->nb_streams ? ++next_generated_track_id : s->streams[i]->id;

3476

}

3477

} else {

3478

for (i = 0; i < mov->nb_streams; i++) {

3479

if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))

3480

continue;

3481

3482

mov->tracks[i].track_id = i + 1;

3483

}

3484

}

3485

3486

mov->track_ids_ok = 1;

3487

3488

return 0;

3489

}

3490

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

3491

static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov,

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

3492

AVFormatContext *s)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

3493

{

>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)

Jan 23, 2006

3494

int i;

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

3495

int64_t pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

3496

avio_wb32(pb, 0); /* size placeholder*/

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

3497

ffio_wfourcc(pb, "moov");

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

3498

avformat/movenc: added ability to use original stream ids as track id…

Aug 31, 2016

3499

mov_setup_track_ids(mov, s);

3500

movenc: K&R formatting cosmetics

Jul 7, 2013

3501

for (i = 0; i < mov->nb_streams; i++) {

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3502

if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))

3503

continue;

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

3504

movenc: K&R formatting cosmetics

Jul 7, 2013

3505

mov->tracks[i].time = mov->time;

movenc: Write file with minimal number of chunks for the given interl…

Nov 29, 2011

3506

movenc: fix crashes if a stream is empty.

Feb 12, 2012

3507

if (mov->tracks[i].entry)

3508

build_chunks(&mov->tracks[i]);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

3509

}

3510

movenc: Write QuickTime chapters

May 5, 2010

3511

if (mov->chapter_track)

movenc: K&R formatting cosmetics

Jul 7, 2013

3512

for (i = 0; i < s->nb_streams; i++) {

movenc: Write QuickTime chapters

May 5, 2010

3513

mov->tracks[i].tref_tag = MKTAG('c','h','a','p');

movenc: K&R formatting cosmetics

Jul 7, 2013

3514

mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].track_id;

movenc: Write QuickTime chapters

May 5, 2010

3515

}

Add initial support for RTP hinting in the mov muxer

May 18, 2010

3516

for (i = 0; i < mov->nb_streams; i++) {

movenc: add fallback audio track tref support

Nov 5, 2015

3517

MOVTrack *track = &mov->tracks[i];

3518

if (track->tag == MKTAG('r','t','p',' ')) {

3519

track->tref_tag = MKTAG('h','i','n','t');

3520

track->tref_id = mov->tracks[track->src_track].track_id;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3521

} else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) {

movenc: add fallback audio track tref support

Nov 5, 2015

3522

int * fallback, size;

3523

fallback = (int*)av_stream_get_side_data(track->st,

3524

AV_PKT_DATA_FALLBACK_TRACK,

3525

&size);

3526

if (fallback != NULL && size == sizeof(int)) {

3527

if (*fallback >= 0 && *fallback < mov->nb_streams) {

3528

track->tref_tag = MKTAG('f','a','l','l');

3529

track->tref_id = mov->tracks[*fallback].track_id;

3530

}

3531

}

Add initial support for RTP hinting in the mov muxer

May 18, 2010

3532

}

3533

}

movenc: add timecode track support.

Mar 5, 2012

3534

for (i = 0; i < mov->nb_streams; i++) {

3535

if (mov->tracks[i].tag == MKTAG('t','m','c','d')) {

3536

int src_trk = mov->tracks[i].src_track;

3537

mov->tracks[src_trk].tref_tag = mov->tracks[i].tag;

3538

mov->tracks[src_trk].tref_id = mov->tracks[i].track_id;

avformat/movenc: rescale when copying duration to timecode track

Mar 12, 2014

3539

//src_trk may have a different timescale than the tmcd track

3540

mov->tracks[i].track_duration = av_rescale(mov->tracks[src_trk].track_duration,

3541

mov->tracks[i].timescale,

3542

mov->tracks[src_trk].timescale);

movenc: add timecode track support.

Mar 5, 2012

3543

}

3544

}

movenc: Write QuickTime chapters

May 5, 2010

3545

mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global head…

Sep 9, 2003

3546

mov_write_mvhd_tag(pb, mov);

movenc: Rudimentary IODs support.

Oct 4, 2011

3547

if (mov->mode != MODE_MOV && !mov->iods_skip)

3548

mov_write_iods_tag(pb, mov);

movenc: K&R formatting cosmetics

Jul 7, 2013

3549

for (i = 0; i < mov->nb_streams; i++) {

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3550

if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

3551

            int ret = mov_write_trak_tag(s, pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

3552

if (ret < 0)

3553

return ret;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

3554

}

3555

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3556

if (mov->flags & FF_MOV_FLAG_FRAGMENT)

3557

mov_write_mvex_tag(pb, mov); /* QuickTime requires trak to precede this */

movenc: fragment support

Dec 6, 2011

3558

Fix for title field in PSP compatible mp4 files. Patch by

Jan 24, 2006

3559

if (mov->mode == MODE_PSP)

3560

mov_write_uuidusmt_tag(pb, s);

support for 3gp metadata

Jun 11, 2008

3561

else

reindentation, patch by From: Steve Lhomme, slhomme divxcorp com

Nov 1, 2006

3562

mov_write_udta_tag(pb, mov, s);

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

3563

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3564

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

3565

}

3566

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3567

static void param_write_int(AVIOContext *pb, const char *name, int value)

3568

{

3569

    avio_printf(pb, "<param name=\"%s\" value=\"%d\" valuetype=\"data\"/>\n", name, value);

3570

}

3571

3572

static void param_write_string(AVIOContext *pb, const char *name, const char *value)

3573

{

3574

    avio_printf(pb, "<param name=\"%s\" value=\"%s\" valuetype=\"data\"/>\n", name, value);

3575

}

3576

3577

static void param_write_hex(AVIOContext *pb, const char *name, const uint8_t *value, int len)

3578

{

3579

char buf[150];

movenc: K&R formatting cosmetics

Jul 7, 2013

3580

len = FFMIN(sizeof(buf) / 2 - 1, len);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3581

ff_data_to_hex(buf, value, len, 0);

movenc: K&R formatting cosmetics

Jul 7, 2013

3582

buf[2 * len] = '\0';

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3583

    avio_printf(pb, "<param name=\"%s\" value=\"%s\" valuetype=\"data\"/>\n", name, buf);

3584

}

3585

avformat/movenc: added ability to use original stream ids as track id…

Aug 31, 2016

3586

static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormatContext *s)

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3587

{

3588

int64_t pos = avio_tell(pb);

3589

int i;

movenc: use similar logic to DASH when writing bit rate to ISML

Sep 27, 2016

3590

int64_t manifest_bit_rate = 0;

3591

AVCPBProperties *props = NULL;

3592

movenc: make uuids static const

Aug 2, 2013

3593

static const uint8_t uuid[] = {

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3594

0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd,

3595

0xba, 0x2f, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66

3596

};

3597

3598

avio_wb32(pb, 0);

3599

ffio_wfourcc(pb, "uuid");

3600

avio_write(pb, uuid, sizeof(uuid));

3601

avio_wb32(pb, 0);

3602

3603

avio_printf(pb, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");

3604

avio_printf(pb, "<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\">\n");

3605

avio_printf(pb, "<head>\n");

avformat/movenc: Drop redundant bit exact field from context

Jul 18, 2015

3606

if (!(mov->fc->flags & AVFMT_FLAG_BITEXACT))

avformat/movenc: omit avformat ident from isml_manifest for bitexact …

Mar 16, 2014

3607

avio_printf(pb, "<meta name=\"creator\" content=\"%s\" />\n",

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3608

LIBAVFORMAT_IDENT);

3609

avio_printf(pb, "</head>\n");

3610

avio_printf(pb, "<body>\n");

3611

avio_printf(pb, "<switch>\n");

avformat/movenc: added ability to use original stream ids as track id…

Aug 31, 2016

3612

3613

mov_setup_track_ids(mov, s);

3614

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3615

for (i = 0; i < mov->nb_streams; i++) {

3616

MOVTrack *track = &mov->tracks[i];

3617

const char *type;

avformat/movenc: added ability to use original stream ids as track id…

Aug 31, 2016

3618

int track_id = track->track_id;

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3619

movenc: Add support for writing language codes into ISML manifests

Sep 26, 2016

3620

AVStream *st = track->st;

3621

AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0);

3622

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3623

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) {

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3624

type = "video";

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3625

} else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) {

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3626

type = "audio";

3627

} else {

3628

continue;

3629

}

movenc: use similar logic to DASH when writing bit rate to ISML

Sep 27, 2016

3630

3631

        props = (AVCPBProperties*)av_stream_get_side_data(track->st, AV_PKT_DATA_CPB_PROPERTIES, NULL);

3632

3633

if (track->par->bit_rate) {

3634

manifest_bit_rate = track->par->bit_rate;

3635

} else if (props) {

3636

manifest_bit_rate = props->max_bitrate;

3637

}

3638

lavc: Switch bitrate to 64bit unless compatibility with avconv was re…

Sep 15, 2015

3639

avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type,

movenc: use similar logic to DASH when writing bit rate to ISML

Sep 27, 2016

3640

manifest_bit_rate);

3641

param_write_int(pb, "systemBitrate", manifest_bit_rate);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3642

param_write_int(pb, "trackID", track_id);

movenc: Add support for writing language codes into ISML manifests

Sep 26, 2016

3643

param_write_string(pb, "systemLanguage", lang ? lang->value : "und");

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3644

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) {

3645

if (track->par->codec_id == AV_CODEC_ID_H264) {

avc: Add a function for converting mp4 style extradata to annex b

Mar 22, 2012

3646

uint8_t *ptr;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3647

int size = track->par->extradata_size;

3648

if (!ff_avc_write_annexb_extradata(track->par->extradata, &ptr,

avc: Add a function for converting mp4 style extradata to annex b

Mar 22, 2012

3649

&size)) {

3650

param_write_hex(pb, "CodecPrivateData",

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3651

ptr ? ptr : track->par->extradata,

avc: Add a function for converting mp4 style extradata to annex b

Mar 22, 2012

3652

size);

3653

av_free(ptr);

3654

}

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3655

param_write_string(pb, "FourCC", "H264");

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3656

} else if (track->par->codec_id == AV_CODEC_ID_VC1) {

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3657

param_write_string(pb, "FourCC", "WVC1");

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3658

param_write_hex(pb, "CodecPrivateData", track->par->extradata,

3659

track->par->extradata_size);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3660

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3661

param_write_int(pb, "MaxWidth", track->par->width);

3662

param_write_int(pb, "MaxHeight", track->par->height);

3663

param_write_int(pb, "DisplayWidth", track->par->width);

3664

param_write_int(pb, "DisplayHeight", track->par->height);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3665

} else {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3666

if (track->par->codec_id == AV_CODEC_ID_AAC) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

3667

switch (track->par->profile)

avformat/movenc: HE-AAC correct FourCC in ISML

Dec 1, 2015

3668

{

3669

case FF_PROFILE_AAC_HE_V2:

3670

param_write_string(pb, "FourCC", "AACP");

3671

break;

3672

case FF_PROFILE_AAC_HE:

3673

param_write_string(pb, "FourCC", "AACH");

3674

break;

3675

default:

3676

param_write_string(pb, "FourCC", "AACL");

3677

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3678

} else if (track->par->codec_id == AV_CODEC_ID_WMAPRO) {

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3679

param_write_string(pb, "FourCC", "WMAP");

3680

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3681

param_write_hex(pb, "CodecPrivateData", track->par->extradata,

3682

track->par->extradata_size);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3683

param_write_int(pb, "AudioTag", ff_codec_get_tag(ff_codec_wav_tags,

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3684

track->par->codec_id));

3685

param_write_int(pb, "Channels", track->par->channels);

3686

param_write_int(pb, "SamplingRate", track->par->sample_rate);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3687

param_write_int(pb, "BitsPerSample", 16);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3688

param_write_int(pb, "PacketSize", track->par->block_align ?

3689

track->par->block_align : 4);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3690

}

3691

avio_printf(pb, "</%s>\n", type);

3692

}

3693

avio_printf(pb, "</switch>\n");

3694

avio_printf(pb, "</body>\n");

3695

avio_printf(pb, "</smil>\n");

3696

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3697

return update_size(pb, pos);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

3698

}

3699

movenc: fragment support

Dec 6, 2011

3700

static int mov_write_mfhd_tag(AVIOContext *pb, MOVMuxContext *mov)

3701

{

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3702

avio_wb32(pb, 16);

movenc: fragment support

Dec 6, 2011

3703

ffio_wfourcc(pb, "mfhd");

3704

avio_wb32(pb, 0);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3705

avio_wb32(pb, mov->fragments);

3706

return 0;

3707

}

3708

movenc: Set tfhd default sample flags based on actual samples, if pos…

Mar 6, 2015

3709

static uint32_t get_sample_flags(MOVTrack *track, MOVIentry *entry)

3710

{

3711

return entry->flags & MOV_SYNC_SAMPLE ? MOV_FRAG_SAMPLE_FLAG_DEPENDS_NO :

3712

(MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES | MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC);

3713

}

3714

movenc: Add an option for omitting the tfhd base offset

Sep 9, 2013

3715

static int mov_write_tfhd_tag(AVIOContext *pb, MOVMuxContext *mov,

3716

MOVTrack *track, int64_t moof_offset)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3717

{

3718

int64_t pos = avio_tell(pb);

mov: Use defines for tfhd flags

Feb 16, 2012

3719

uint32_t flags = MOV_TFHD_DEFAULT_SIZE | MOV_TFHD_DEFAULT_DURATION |

3720

MOV_TFHD_BASE_DATA_OFFSET;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3721

if (!track->entry) {

mov: Use defines for tfhd flags

Feb 16, 2012

3722

flags |= MOV_TFHD_DURATION_IS_EMPTY;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3723

} else {

mov: Use defines for tfhd flags

Feb 16, 2012

3724

flags |= MOV_TFHD_DEFAULT_FLAGS;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3725

}

movenc: Add an option for omitting the tfhd base offset

Sep 9, 2013

3726

if (mov->flags & FF_MOV_FLAG_OMIT_TFHD_OFFSET)

3727

flags &= ~MOV_TFHD_BASE_DATA_OFFSET;

movenc: Add a flag for using default-base-is-moof in tfhd atoms

Oct 29, 2014

3728

if (mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF) {

3729

flags &= ~MOV_TFHD_BASE_DATA_OFFSET;

3730

flags |= MOV_TFHD_DEFAULT_BASE_IS_MOOF;

3731

}

movenc: fragment support

Dec 6, 2011

3732

movenc: Don't set a default sample duration when creating ismv

Jan 31, 2012

3733

/* Don't set a default sample size, the silverlight player refuses

3734

* to play files with that set. Don't set a default sample duration,

Turn off usage of base_data_offset in tfhd for PIFF files

Mar 24, 2013

3735

* WMP freaks out if it is set. Don't set a base data offset, PIFF

3736

* file format says it MUST NOT be set. */

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3737

if (track->mode == MODE_ISM)

Turn off usage of base_data_offset in tfhd for PIFF files

Mar 24, 2013

3738

flags &= ~(MOV_TFHD_DEFAULT_SIZE | MOV_TFHD_DEFAULT_DURATION |

3739

MOV_TFHD_BASE_DATA_OFFSET);

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3740

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3741

avio_wb32(pb, 0); /* size placeholder */

3742

ffio_wfourcc(pb, "tfhd");

3743

avio_w8(pb, 0); /* version */

3744

avio_wb24(pb, flags);

3745

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3746

avio_wb32(pb, track->track_id); /* track-id */

mov: Use defines for tfhd flags

Feb 16, 2012

3747

if (flags & MOV_TFHD_BASE_DATA_OFFSET)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3748

avio_wb64(pb, moof_offset);

mov: Use defines for tfhd flags

Feb 16, 2012

3749

if (flags & MOV_TFHD_DEFAULT_DURATION) {

movenc: use the first cluster duration as the tfhd default duration

Feb 26, 2012

3750

track->default_duration = get_cluster_duration(track, 0);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3751

avio_wb32(pb, track->default_duration);

3752

}

mov: Use defines for tfhd flags

Feb 16, 2012

3753

if (flags & MOV_TFHD_DEFAULT_SIZE) {

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3754

track->default_size = track->entry ? track->cluster[0].size : 1;

3755

avio_wb32(pb, track->default_size);

3756

} else

3757

track->default_size = -1;

3758

mov: Use defines for tfhd flags

Feb 16, 2012

3759

if (flags & MOV_TFHD_DEFAULT_FLAGS) {

movenc: Set tfhd default sample flags based on actual samples, if pos…

Mar 6, 2015

3760

/* Set the default flags based on the second sample, if available.

3761

         * If the first sample is different, that can be signaled via a separate field. */

3762

if (track->entry > 1)

3763

track->default_sample_flags = get_sample_flags(track, &track->cluster[1]);

3764

else

3765

track->default_sample_flags =

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

3766

track->par->codec_type == AVMEDIA_TYPE_VIDEO ?

movenc: Set tfhd default sample flags based on actual samples, if pos…

Mar 6, 2015

3767

(MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES | MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC) :

3768

MOV_FRAG_SAMPLE_FLAG_DEPENDS_NO;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3769

avio_wb32(pb, track->default_sample_flags);

3770

}

3771

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3772

return update_size(pb, pos);

movenc: fragment support

Dec 6, 2011

3773

}

3774

movenc: Add an option for omitting the tfhd base offset

Sep 9, 2013

3775

static int mov_write_trun_tag(AVIOContext *pb, MOVMuxContext *mov,

movenc: Support writing multiple trun atoms

Sep 10, 2013

3776

MOVTrack *track, int moof_size,

3777

int first, int end)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3778

{

3779

int64_t pos = avio_tell(pb);

mov: Use defines for trun flags

Feb 16, 2012

3780

uint32_t flags = MOV_TRUN_DATA_OFFSET;

movenc: fragment support

Dec 6, 2011

3781

int i;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3782

movenc: Support writing multiple trun atoms

Sep 10, 2013

3783

for (i = first; i < end; i++) {

movenc: factorize calculation of cluster duration into a separate fun…

Feb 26, 2012

3784

if (get_cluster_duration(track, i) != track->default_duration)

mov: Use defines for trun flags

Feb 16, 2012

3785

flags |= MOV_TRUN_SAMPLE_DURATION;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3786

if (track->cluster[i].size != track->default_size)

mov: Use defines for trun flags

Feb 16, 2012

3787

flags |= MOV_TRUN_SAMPLE_SIZE;

movenc: Support writing multiple trun atoms

Sep 10, 2013

3788

        if (i > first && get_sample_flags(track, &track->cluster[i]) != track->default_sample_flags)

mov: Use defines for trun flags

Feb 16, 2012

3789

flags |= MOV_TRUN_SAMPLE_FLAGS;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3790

}

movenc: Avoid writing separate flags for the first sample if not nece…

Mar 6, 2015

3791

if (!(flags & MOV_TRUN_SAMPLE_FLAGS) && track->entry > 0 &&

3792

get_sample_flags(track, &track->cluster[0]) != track->default_sample_flags)

mov: Use defines for trun flags

Feb 16, 2012

3793

flags |= MOV_TRUN_FIRST_SAMPLE_FLAGS;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3794

if (track->flags & MOV_TRACK_CTTS)

mov: Use defines for trun flags

Feb 16, 2012

3795

flags |= MOV_TRUN_SAMPLE_CTS;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3796

3797

avio_wb32(pb, 0); /* size placeholder */

3798

ffio_wfourcc(pb, "trun");

3799

avio_w8(pb, 0); /* version */

3800

avio_wb24(pb, flags);

3801

movenc: Support writing multiple trun atoms

Sep 10, 2013

3802

avio_wb32(pb, end - first); /* sample count */

movenc: Add an option for omitting the tfhd base offset

Sep 9, 2013

3803

if (mov->flags & FF_MOV_FLAG_OMIT_TFHD_OFFSET &&

movenc: Remove a now redundant check

Oct 29, 2014

3804

!(mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF) &&

movenc: Don't use track_id to decide which track is the first in a moof

Oct 29, 2014

3805

!mov->first_trun)

movenc: Add an option for omitting the tfhd base offset

Sep 9, 2013

3806

avio_wb32(pb, 0); /* Later tracks follow immediately after the previous one */

3807

else

3808

avio_wb32(pb, moof_size + 8 + track->data_offset +

movenc: Support writing multiple trun atoms

Sep 10, 2013

3809

track->cluster[first].pos); /* data offset */

mov: Use defines for trun flags

Feb 16, 2012

3810

if (flags & MOV_TRUN_FIRST_SAMPLE_FLAGS)

movenc: Support writing multiple trun atoms

Sep 10, 2013

3811

avio_wb32(pb, get_sample_flags(track, &track->cluster[first]));

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3812

movenc: Support writing multiple trun atoms

Sep 10, 2013

3813

for (i = first; i < end; i++) {

mov: Use defines for trun flags

Feb 16, 2012

3814

if (flags & MOV_TRUN_SAMPLE_DURATION)

movenc: factorize calculation of cluster duration into a separate fun…

Feb 26, 2012

3815

avio_wb32(pb, get_cluster_duration(track, i));

mov: Use defines for trun flags

Feb 16, 2012

3816

if (flags & MOV_TRUN_SAMPLE_SIZE)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3817

avio_wb32(pb, track->cluster[i].size);

mov: Use defines for trun flags

Feb 16, 2012

3818

if (flags & MOV_TRUN_SAMPLE_FLAGS)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3819

avio_wb32(pb, get_sample_flags(track, &track->cluster[i]));

mov: Use defines for trun flags

Feb 16, 2012

3820

if (flags & MOV_TRUN_SAMPLE_CTS)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3821

avio_wb32(pb, track->cluster[i].cts);

3822

}

3823

movenc: Don't use track_id to decide which track is the first in a moof

Oct 29, 2014

3824

mov->first_trun = 0;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3825

return update_size(pb, pos);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3826

}

3827

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3828

static int mov_write_tfxd_tag(AVIOContext *pb, MOVTrack *track)

3829

{

movenc: fragment support

Dec 6, 2011

3830

int64_t pos = avio_tell(pb);

movenc: make uuids static const

Aug 2, 2013

3831

static const uint8_t uuid[] = {

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3832

0x6d, 0x1d, 0x9b, 0x05, 0x42, 0xd5, 0x44, 0xe6,

3833

0x80, 0xe2, 0x14, 0x1d, 0xaf, 0xf7, 0x57, 0xb2

3834

};

3835

3836

avio_wb32(pb, 0); /* size placeholder */

3837

ffio_wfourcc(pb, "uuid");

3838

avio_write(pb, uuid, sizeof(uuid));

3839

avio_w8(pb, 1);

3840

avio_wb24(pb, 0);

movenc: Write pts timestamps in tfxd, instead of dts timestamps

Mar 16, 2015

3841

avio_wb64(pb, track->start_dts + track->frag_start +

3842

track->cluster[0].cts);

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

3843

avio_wb64(pb, track->end_pts -

3844

(track->cluster[0].dts + track->cluster[0].cts));

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3845

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

3846

return update_size(pb, pos);

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3847

}

3848

3849

static int mov_write_tfrf_tag(AVIOContext *pb, MOVMuxContext *mov,

3850

MOVTrack *track, int entry)

3851

{

3852

int n = track->nb_frag_info - 1 - entry, i;

3853

int size = 8 + 16 + 4 + 1 + 16*n;

movenc: make uuids static const

Aug 2, 2013

3854

static const uint8_t uuid[] = {

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3855

0xd4, 0x80, 0x7e, 0xf2, 0xca, 0x39, 0x46, 0x95,

3856

0x8e, 0x54, 0x26, 0xcb, 0x9e, 0x46, 0xa7, 0x9f

3857

};

3858

3859

if (entry < 0)

3860

return 0;

3861

3862

avio_seek(pb, track->frag_info[entry].tfrf_offset, SEEK_SET);

3863

avio_wb32(pb, size);

3864

ffio_wfourcc(pb, "uuid");

3865

avio_write(pb, uuid, sizeof(uuid));

3866

avio_w8(pb, 1);

3867

avio_wb24(pb, 0);

3868

avio_w8(pb, n);

3869

for (i = 0; i < n; i++) {

3870

int index = entry + 1 + i;

3871

avio_wb64(pb, track->frag_info[index].time);

3872

avio_wb64(pb, track->frag_info[index].duration);

3873

}

3874

if (n < mov->ism_lookahead) {

movenc: K&R formatting cosmetics

Jul 7, 2013

3875

int free_size = 16 * (mov->ism_lookahead - n);

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3876

avio_wb32(pb, free_size);

3877

ffio_wfourcc(pb, "free");

lavf/movenc: use ffio_fill()

Jun 30, 2013

3878

ffio_fill(pb, 0, free_size - 8);

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3879

}

3880

3881

return 0;

3882

}

3883

3884

static int mov_write_tfrf_tags(AVIOContext *pb, MOVMuxContext *mov,

3885

MOVTrack *track)

3886

{

3887

int64_t pos = avio_tell(pb);

3888

int i;

3889

for (i = 0; i < mov->ism_lookahead; i++) {

3890

/* Update the tfrf tag for the last ism_lookahead fragments,

3891

* nb_frag_info - 1 is the next fragment to be written. */

3892

mov_write_tfrf_tag(pb, mov, track, track->nb_frag_info - 2 - i);

3893

}

3894

avio_seek(pb, pos, SEEK_SET);

3895

return 0;

3896

}

3897

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

3898

static int mov_add_tfra_entries(AVIOContext *pb, MOVMuxContext *mov, int tracks,

3899

int size)

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

3900

{

3901

int i;

3902

for (i = 0; i < mov->nb_streams; i++) {

3903

MOVTrack *track = &mov->tracks[i];

3904

MOVFragmentInfo *info;

3905

if ((tracks >= 0 && i != tracks) || !track->entry)

3906

continue;

3907

track->nb_frag_info++;

3908

if (track->nb_frag_info >= track->frag_info_capacity) {

3909

unsigned new_capacity = track->nb_frag_info + MOV_FRAG_INFO_ALLOC_INCREMENT;

3910

if (av_reallocp_array(&track->frag_info,

3911

new_capacity,

3912

sizeof(*track->frag_info)))

3913

return AVERROR(ENOMEM);

3914

track->frag_info_capacity = new_capacity;

3915

}

3916

info = &track->frag_info[track->nb_frag_info - 1];

3917

info->offset = avio_tell(pb);

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

3918

info->size = size;

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

3919

// Try to recreate the original pts for the first packet

3920

// from the fields we have stored

3921

info->time = track->start_dts + track->frag_start +

3922

track->cluster[0].cts;

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

3923

info->duration = track->end_pts -

3924

(track->cluster[0].dts + track->cluster[0].cts);

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

3925

// If the pts is less than zero, we will have trimmed

3926

// away parts of the media track using an edit list,

3927

// and the corresponding start presentation time is zero.

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

3928

if (info->time < 0) {

3929

info->duration += info->time;

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

3930

info->time = 0;

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

3931

}

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

3932

info->tfrf_offset = 0;

3933

mov_write_tfrf_tags(pb, mov, track);

3934

}

3935

return 0;

3936

}

3937

movenc: Add an option for skipping writing the mfra/tfra/mfro trailer

Jun 13, 2016

3938

static void mov_prune_frag_info(MOVMuxContext *mov, int tracks, int max)

3939

{

3940

int i;

3941

for (i = 0; i < mov->nb_streams; i++) {

3942

MOVTrack *track = &mov->tracks[i];

3943

if ((tracks >= 0 && i != tracks) || !track->entry)

3944

continue;

3945

if (track->nb_frag_info > max) {

3946

            memmove(track->frag_info, track->frag_info + (track->nb_frag_info - max), max * sizeof(*track->frag_info));

3947

track->nb_frag_info = max;

3948

}

3949

}

3950

}

3951

movenc: Write tfdt atoms

Oct 6, 2014

3952

static int mov_write_tfdt_tag(AVIOContext *pb, MOVTrack *track)

3953

{

3954

int64_t pos = avio_tell(pb);

3955

3956

avio_wb32(pb, 0); /* size */

3957

ffio_wfourcc(pb, "tfdt");

3958

avio_w8(pb, 1); /* version */

3959

avio_wb24(pb, 0);

3960

avio_wb64(pb, track->frag_start);

3961

return update_size(pb, pos);

3962

}

3963

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3964

static int mov_write_traf_tag(AVIOContext *pb, MOVMuxContext *mov,

movenc: Write the moof atom in two passes

Sep 9, 2013

3965

MOVTrack *track, int64_t moof_offset,

3966

int moof_size)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3967

{

3968

int64_t pos = avio_tell(pb);

movenc: Support writing multiple trun atoms

Sep 10, 2013

3969

int i, start = 0;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

3970

avio_wb32(pb, 0); /* size placeholder */

3971

ffio_wfourcc(pb, "traf");

3972

movenc: Add an option for omitting the tfhd base offset

Sep 9, 2013

3973

mov_write_tfhd_tag(pb, mov, track, moof_offset);

movenc: Don't write any tfdt atom for ismv files

Oct 30, 2014

3974

if (mov->mode != MODE_ISM)

3975

mov_write_tfdt_tag(pb, track);

movenc: Support writing multiple trun atoms

Sep 10, 2013

3976

for (i = 1; i < track->entry; i++) {

3977

        if (track->cluster[i].pos != track->cluster[i - 1].pos + track->cluster[i - 1].size) {

3978

mov_write_trun_tag(pb, mov, track, moof_size, start, i);

3979

start = i;

3980

}

3981

}

3982

mov_write_trun_tag(pb, mov, track, moof_size, start, track->entry);

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3983

if (mov->mode == MODE_ISM) {

3984

mov_write_tfxd_tag(pb, track);

3985

3986

if (mov->ism_lookahead) {

movenc: K&R formatting cosmetics

Jul 7, 2013

3987

int i, size = 16 + 4 + 1 + 16 * mov->ism_lookahead;

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3988

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

3989

if (track->nb_frag_info > 0) {

3990

MOVFragmentInfo *info = &track->frag_info[track->nb_frag_info - 1];

3991

if (!info->tfrf_offset)

3992

info->tfrf_offset = avio_tell(pb);

3993

}

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

3994

avio_wb32(pb, 8 + size);

3995

ffio_wfourcc(pb, "free");

3996

for (i = 0; i < size; i++)

3997

avio_w8(pb, 0);

3998

}

3999

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4000

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4001

return update_size(pb, pos);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4002

}

4003

movenc: Write the moof atom in two passes

Sep 9, 2013

4004

static int mov_write_moof_tag_internal(AVIOContext *pb, MOVMuxContext *mov,

4005

int tracks, int moof_size)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4006

{

movenc: Write the moof atom in two passes

Sep 9, 2013

4007

int64_t pos = avio_tell(pb);

4008

int i;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4009

4010

avio_wb32(pb, 0); /* size placeholder */

movenc: fragment support

Dec 6, 2011

4011

ffio_wfourcc(pb, "moof");

movenc: Don't use track_id to decide which track is the first in a moof

Oct 29, 2014

4012

mov->first_trun = 1;

movenc: fragment support

Dec 6, 2011

4013

4014

mov_write_mfhd_tag(pb, mov);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4015

for (i = 0; i < mov->nb_streams; i++) {

4016

MOVTrack *track = &mov->tracks[i];

4017

if (tracks >= 0 && i != tracks)

4018

continue;

4019

if (!track->entry)

4020

continue;

movenc: Write the moof atom in two passes

Sep 9, 2013

4021

mov_write_traf_tag(pb, mov, track, pos, moof_size);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4022

}

4023

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4024

return update_size(pb, pos);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4025

}

4026

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

4027

static int mov_write_sidx_tag(AVIOContext *pb,

4028

MOVTrack *track, int ref_size, int total_sidx_size)

4029

{

4030

int64_t pos = avio_tell(pb), offset_pos, end_pos;

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4031

int64_t presentation_time, duration, offset;

4032

int starts_with_SAP, i, entries;

4033

4034

if (track->entry) {

4035

entries = 1;

4036

presentation_time = track->start_dts + track->frag_start +

4037

track->cluster[0].cts;

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

4038

duration = track->end_pts -

4039

(track->cluster[0].dts + track->cluster[0].cts);

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4040

starts_with_SAP = track->cluster[0].flags & MOV_SYNC_SAMPLE;

movenc: Move sidx edit list timestamp adjustment into a block

Mar 16, 2015

4041

4042

// pts<0 should be cut away using edts

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

4043

if (presentation_time < 0) {

4044

duration += presentation_time;

movenc: Move sidx edit list timestamp adjustment into a block

Mar 16, 2015

4045

presentation_time = 0;

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

4046

}

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4047

} else {

4048

entries = track->nb_frag_info;

movenc: Check that frag_info entries exist in mov_write_sidx_tag

Aug 9, 2015

4049

if (entries <= 0)

4050

return 0;

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4051

presentation_time = track->frag_info[0].time;

4052

}

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

4053

4054

avio_wb32(pb, 0); /* size */

4055

ffio_wfourcc(pb, "sidx");

4056

avio_w8(pb, 1); /* version */

4057

avio_wb24(pb, 0);

4058

avio_wb32(pb, track->track_id); /* reference_ID */

4059

avio_wb32(pb, track->timescale); /* timescale */

4060

avio_wb64(pb, presentation_time); /* earliest_presentation_time */

4061

offset_pos = avio_tell(pb);

4062

avio_wb64(pb, 0); /* first_offset (offset to referenced moof) */

4063

avio_wb16(pb, 0); /* reserved */

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4064

4065

avio_wb16(pb, entries); /* reference_count */

4066

for (i = 0; i < entries; i++) {

4067

if (!track->entry) {

4068

            if (i > 1 && track->frag_info[i].offset != track->frag_info[i - 1].offset + track->frag_info[i - 1].size) {

4069

               av_log(NULL, AV_LOG_ERROR, "Non-consecutive fragments, writing incorrect sidx\n");

4070

}

4071

duration = track->frag_info[i].duration;

4072

ref_size = track->frag_info[i].size;

4073

starts_with_SAP = 1;

4074

}

4075

        avio_wb32(pb, (0 << 31) | (ref_size & 0x7fffffff)); /* reference_type (0 = media) | referenced_size */

4076

avio_wb32(pb, duration); /* subsegment_duration */

4077

        avio_wb32(pb, (starts_with_SAP << 31) | (0 << 28) | 0); /* starts_with_SAP | SAP_type | SAP_delta_time */

4078

}

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

4079

4080

end_pos = avio_tell(pb);

4081

offset = pos + total_sidx_size - end_pos;

4082

avio_seek(pb, offset_pos, SEEK_SET);

4083

avio_wb64(pb, offset);

4084

avio_seek(pb, end_pos, SEEK_SET);

4085

return update_size(pb, pos);

4086

}

4087

4088

static int mov_write_sidx_tags(AVIOContext *pb, MOVMuxContext *mov,

4089

int tracks, int ref_size)

4090

{

4091

int i, round, ret;

4092

AVIOContext *avio_buf;

4093

int total_size = 0;

4094

for (round = 0; round < 2; round++) {

4095

// First run one round to calculate the total size of all

4096

// sidx atoms.

4097

// This would be much simpler if we'd only write one sidx

4098

// atom, for the first track in the moof.

4099

if (round == 0) {

4100

if ((ret = ffio_open_null_buf(&avio_buf)) < 0)

4101

return ret;

4102

} else {

4103

avio_buf = pb;

4104

}

4105

for (i = 0; i < mov->nb_streams; i++) {

4106

MOVTrack *track = &mov->tracks[i];

4107

if (tracks >= 0 && i != tracks)

4108

continue;

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4109

// When writing a sidx for the full file, entry is 0, but

4110

// we want to include all tracks. ref_size is 0 in this case,

4111

// since we read it from frag_info instead.

4112

if (!track->entry && ref_size > 0)

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

4113

continue;

4114

total_size -= mov_write_sidx_tag(avio_buf, track, ref_size,

4115

total_size);

4116

}

4117

if (round == 0)

4118

total_size = ffio_close_null_buf(avio_buf);

4119

}

4120

return 0;

4121

}

4122

4123

static int mov_write_moof_tag(AVIOContext *pb, MOVMuxContext *mov, int tracks,

4124

int64_t mdat_size)

movenc: Write the moof atom in two passes

Sep 9, 2013

4125

{

4126

AVIOContext *avio_buf;

4127

int ret, moof_size;

4128

movenc: Use null buffers for measuring the amount of data to be written

Sep 18, 2013

4129

if ((ret = ffio_open_null_buf(&avio_buf)) < 0)

movenc: Write the moof atom in two passes

Sep 9, 2013

4130

return ret;

4131

mov_write_moof_tag_internal(avio_buf, mov, tracks, 0);

movenc: Use null buffers for measuring the amount of data to be written

Sep 18, 2013

4132

moof_size = ffio_close_null_buf(avio_buf);

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

4133

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

4134

if (mov->flags & FF_MOV_FLAG_DASH && !(mov->flags & FF_MOV_FLAG_GLOBAL_SIDX))

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

4135

mov_write_sidx_tags(pb, mov, tracks, moof_size + 8 + mdat_size);

4136

movenc: Add an option for skipping writing the mfra/tfra/mfro trailer

Jun 13, 2016

4137

if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX ||

4138

!(mov->flags & FF_MOV_FLAG_SKIP_TRAILER) ||

4139

mov->ism_lookahead) {

4140

        if ((ret = mov_add_tfra_entries(pb, mov, tracks, moof_size + 8 + mdat_size)) < 0)

4141

return ret;

4142

if (!(mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) &&

4143

mov->flags & FF_MOV_FLAG_SKIP_TRAILER) {

4144

mov_prune_frag_info(mov, tracks, mov->ism_lookahead + 1);

4145

}

4146

}

movenc: Factorize adding fragment info into a separate function

Oct 12, 2014

4147

movenc: Write the moof atom in two passes

Sep 9, 2013

4148

return mov_write_moof_tag_internal(pb, mov, tracks, moof_size);

4149

}

4150

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4151

static int mov_write_tfra_tag(AVIOContext *pb, MOVTrack *track)

4152

{

4153

int64_t pos = avio_tell(pb);

4154

int i;

4155

4156

avio_wb32(pb, 0); /* size placeholder */

4157

ffio_wfourcc(pb, "tfra");

4158

avio_w8(pb, 1); /* version */

4159

avio_wb24(pb, 0);

4160

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4161

avio_wb32(pb, track->track_id);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4162

avio_wb32(pb, 0); /* length of traf/trun/sample num */

4163

avio_wb32(pb, track->nb_frag_info);

4164

for (i = 0; i < track->nb_frag_info; i++) {

4165

avio_wb64(pb, track->frag_info[i].time);

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4166

avio_wb64(pb, track->frag_info[i].offset + track->data_offset);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4167

avio_w8(pb, 1); /* traf number */

4168

avio_w8(pb, 1); /* trun number */

4169

avio_w8(pb, 1); /* sample number */

4170

}

4171

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4172

return update_size(pb, pos);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4173

}

4174

4175

static int mov_write_mfra_tag(AVIOContext *pb, MOVMuxContext *mov)

4176

{

4177

int64_t pos = avio_tell(pb);

4178

int i;

4179

4180

avio_wb32(pb, 0); /* size placeholder */

4181

ffio_wfourcc(pb, "mfra");

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

4182

/* An empty mfra atom is enough to indicate to the publishing point that

4183

* the stream has ended. */

4184

if (mov->flags & FF_MOV_FLAG_ISML)

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4185

return update_size(pb, pos);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4186

4187

for (i = 0; i < mov->nb_streams; i++) {

4188

MOVTrack *track = &mov->tracks[i];

4189

if (track->nb_frag_info)

4190

mov_write_tfra_tag(pb, track);

4191

}

4192

4193

avio_wb32(pb, 16);

4194

ffio_wfourcc(pb, "mfro");

4195

avio_wb32(pb, 0); /* version + flags */

4196

avio_wb32(pb, avio_tell(pb) + 4 - pos);

movenc: fragment support

Dec 6, 2011

4197

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4198

return update_size(pb, pos);

movenc: fragment support

Dec 6, 2011

4199

}

4200

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

4201

static int mov_write_mdat_tag(AVIOContext *pb, MOVMuxContext *mov)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

4202

{

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4203

avio_wb32(pb, 8); // placeholder for extended size field (64 bit)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4204

ffio_wfourcc(pb, mov->mode == MODE_MOV ? "wide" : "free");

>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)

Jan 23, 2006

4205

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

4206

mov->mdat_pos = avio_tell(pb);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4207

avio_wb32(pb, 0); /* size placeholder*/

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4208

ffio_wfourcc(pb, "mdat");

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

4209

return 0;

4210

}

4211

4212

/* TODO: This needs to be more general */

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

4213

static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

4214

{

Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is alre…

Feb 28, 2009

4215

MOVMuxContext *mov = s->priv_data;

avio: add avio_tell macro as a replacement for url_ftell

Mar 3, 2011

4216

int64_t pos = avio_tell(pb);

simplify ipod brand selection

Jun 14, 2008

4217

int has_h264 = 0, has_video = 0;

set correct ftyp minor version for 3gp/2

Jun 15, 2008

4218

int minor = 0x200;

write usual brand for ipod format

Jun 11, 2008

4219

int i;

AAC support in mov, correct aspect ratio support and user data suppor…

Feb 14, 2004

4220

put avc1 brand in compat list when h264 is present

Jun 14, 2008

4221

for (i = 0; i < s->nb_streams; i++) {

4222

AVStream *st = s->streams[i];

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4223

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)

simplify ipod brand selection

Jun 14, 2008

4224

has_video = 1;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4225

if (st->codecpar->codec_id == AV_CODEC_ID_H264)

put avc1 brand in compat list when h264 is present

Jun 14, 2008

4226

has_h264 = 1;

4227

}

4228

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4229

avio_wb32(pb, 0); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4230

ffio_wfourcc(pb, "ftyp");

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

4231

movenc: Allow override of major brand in ftyp atom

Mar 18, 2014

4232

if (mov->major_brand && strlen(mov->major_brand) >= 4)

4233

ffio_wfourcc(pb, mov->major_brand);

4234

else if (mov->mode == MODE_3GP) {

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4235

ffio_wfourcc(pb, has_h264 ? "3gp6" : "3gp4");

set correct ftyp minor version for 3gp/2

Jun 15, 2008

4236

minor = has_h264 ? 0x100 : 0x200;

4237

} else if (mov->mode & MODE_3G2) {

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4238

ffio_wfourcc(pb, has_h264 ? "3g2b" : "3g2a");

set correct ftyp minor version for 3gp/2

Jun 15, 2008

4239

minor = has_h264 ? 0x20000 : 0x10000;

movenc: K&R formatting cosmetics

Jul 7, 2013

4240

} else if (mov->mode == MODE_PSP)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4241

ffio_wfourcc(pb, "MSNV");

movenc: Add a flag for using default-base-is-moof in tfhd atoms

Oct 29, 2014

4242

else if (mov->mode == MODE_MP4 && mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF)

4243

ffio_wfourcc(pb, "iso5"); // Required when using default-base-is-moof

write usual brand for ipod format

Jun 11, 2008

4244

else if (mov->mode == MODE_MP4)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4245

ffio_wfourcc(pb, "isom");

simplify ipod brand selection

Jun 14, 2008

4246

else if (mov->mode == MODE_IPOD)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4247

ffio_wfourcc(pb, has_video ? "M4V ":"M4A ");

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

4248

else if (mov->mode == MODE_ISM)

4249

ffio_wfourcc(pb, "isml");

lavf/movenc: add F4V flavor.

Sep 17, 2012

4250

else if (mov->mode == MODE_F4V)

4251

ffio_wfourcc(pb, "f4v ");

simplify ipod brand selection

Jun 14, 2008

4252

else

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4253

ffio_wfourcc(pb, "qt ");

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

4254

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4255

avio_wb32(pb, minor);

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

4256

movenc: K&R formatting cosmetics

Jul 7, 2013

4257

if (mov->mode == MODE_MOV)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4258

ffio_wfourcc(pb, "qt ");

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

4259

else if (mov->mode == MODE_ISM) {

4260

ffio_wfourcc(pb, "piff");

movenc: Add a flag for using default-base-is-moof in tfhd atoms

Oct 29, 2014

4261

} else if (!(mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF)) {

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4262

ffio_wfourcc(pb, "isom");

4263

ffio_wfourcc(pb, "iso2");

movenc: K&R formatting cosmetics

Jul 7, 2013

4264

if (has_h264)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4265

ffio_wfourcc(pb, "avc1");

invert mode_mov condition

Jun 14, 2008

4266

}

Add isom to the compatible brands.

Jun 13, 2008

4267

movenc: Signal iso6 in compatible_brands when using tfdt

Oct 29, 2014

4268

// We add tfdt atoms when fragmenting, signal this with the iso6 compatible

4269

// brand. This is compatible with users that don't understand tfdt.

movenc: Don't write any tfdt atom for ismv files

Oct 30, 2014

4270

if (mov->flags & FF_MOV_FLAG_FRAGMENT && mov->mode != MODE_ISM)

movenc: Signal iso6 in compatible_brands when using tfdt

Oct 29, 2014

4271

ffio_wfourcc(pb, "iso6");

4272

cosmetics, remove whitespaces before and after parenthesis

Feb 6, 2008

4273

if (mov->mode == MODE_3GP)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4274

ffio_wfourcc(pb, has_h264 ? "3gp6":"3gp4");

simplify MODE_3G2

Jun 12, 2008

4275

else if (mov->mode & MODE_3G2)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4276

ffio_wfourcc(pb, has_h264 ? "3g2b":"3g2a");

cosmetics, remove whitespaces before and after parenthesis

Feb 6, 2008

4277

else if (mov->mode == MODE_PSP)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4278

ffio_wfourcc(pb, "MSNV");

write usual brand for ipod format

Jun 11, 2008

4279

else if (mov->mode == MODE_MP4)

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4280

ffio_wfourcc(pb, "mp41");

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4281

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

4282

if (mov->flags & FF_MOV_FLAG_DASH && mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

4283

ffio_wfourcc(pb, "dash");

4284

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4285

return update_size(pb, pos);

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

4286

}

4287

avformat/movenc: Check frame rate in mov_write_uuidprof_tag()

Oct 9, 2016

4288

static int mov_write_uuidprof_tag(AVIOContext *pb, AVFormatContext *s)

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

4289

{

lavf: switch to AVStream.time_base as the hint for the muxer timebase

May 18, 2014

4290

AVStream *video_st = s->streams[0];

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4291

AVCodecParameters *video_par = s->streams[0]->codecpar;

4292

AVCodecParameters *audio_par = s->streams[1]->codecpar;

4293

int audio_rate = audio_par->sample_rate;

avformat/movenc: Check frame rate before use.

Nov 17, 2016

4294

int64_t frame_rate = video_st->avg_frame_rate.den ?

4295

(video_st->avg_frame_rate.num * 0x10000LL) / video_st->avg_frame_rate.den :

4296

0;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4297

int audio_kbitrate = audio_par->bit_rate / 1000;

4298

int video_kbitrate = FFMIN(video_par->bit_rate / 1000, 800 - audio_kbitrate);

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

4299

avformat/movenc: Check frame rate in mov_write_uuidprof_tag()

Oct 9, 2016

4300

if (frame_rate < 0 || frame_rate > INT32_MAX) {

4301

        av_log(s, AV_LOG_ERROR, "Frame rate %f outside supported range\n", frame_rate / (double)0x10000);

4302

return AVERROR(EINVAL);

4303

}

4304

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4305

avio_wb32(pb, 0x94); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4306

ffio_wfourcc(pb, "uuid");

4307

ffio_wfourcc(pb, "PROF");

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

4308

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4309

avio_wb32(pb, 0x21d24fce); /* 96 bit UUID */

4310

avio_wb32(pb, 0xbb88695c);

4311

avio_wb32(pb, 0xfac9c740);

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

4312

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4313

avio_wb32(pb, 0x0); /* ? */

4314

avio_wb32(pb, 0x3); /* 3 sections ? */

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

4315

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4316

avio_wb32(pb, 0x14); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4317

ffio_wfourcc(pb, "FPRF");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4318

avio_wb32(pb, 0x0); /* ? */

4319

avio_wb32(pb, 0x0); /* ? */

4320

avio_wb32(pb, 0x0); /* ? */

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

4321

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4322

avio_wb32(pb, 0x2c); /* size */

movenc: K&R formatting cosmetics

Jul 7, 2013

4323

ffio_wfourcc(pb, "APRF"); /* audio */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4324

avio_wb32(pb, 0x0);

4325

avio_wb32(pb, 0x2); /* TrackID */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4326

ffio_wfourcc(pb, "mp4a");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4327

avio_wb32(pb, 0x20f);

4328

avio_wb32(pb, 0x0);

4329

avio_wb32(pb, audio_kbitrate);

4330

avio_wb32(pb, audio_kbitrate);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4331

avio_wb32(pb, audio_rate);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4332

avio_wb32(pb, audio_par->channels);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4333

4334

avio_wb32(pb, 0x34); /* size */

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4335

ffio_wfourcc(pb, "VPRF"); /* video */

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4336

avio_wb32(pb, 0x0);

4337

avio_wb32(pb, 0x1); /* TrackID */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4338

if (video_par->codec_id == AV_CODEC_ID_H264) {

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4339

ffio_wfourcc(pb, "avc1");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4340

avio_wb16(pb, 0x014D);

4341

avio_wb16(pb, 0x0015);

little h.264 related hunk from diff between cvs and mobile hackerz

Apr 4, 2006

4342

} else {

lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Feb 24, 2011

4343

ffio_wfourcc(pb, "mp4v");

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4344

avio_wb16(pb, 0x0000);

4345

avio_wb16(pb, 0x0103);

little h.264 related hunk from diff between cvs and mobile hackerz

Apr 4, 2006

4346

}

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4347

avio_wb32(pb, 0x0);

4348

avio_wb32(pb, video_kbitrate);

4349

avio_wb32(pb, video_kbitrate);

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4350

avio_wb32(pb, frame_rate);

4351

avio_wb32(pb, frame_rate);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4352

avio_wb16(pb, video_par->width);

4353

avio_wb16(pb, video_par->height);

avio: avio: avio_ prefixes for put_* functions

Feb 21, 2011

4354

avio_wb32(pb, 0x010001); /* ? */

avformat/movenc: Check frame rate in mov_write_uuidprof_tag()

Oct 9, 2016

4355

4356

return 0;

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

4357

}

4358

movenc: Factorize writing ftyp and other identification tags to a sep…

Dec 18, 2014

4359

static int mov_write_identification(AVIOContext *pb, AVFormatContext *s)

4360

{

4361

MOVMuxContext *mov = s->priv_data;

Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'

Jan 3, 2015

4362

int i;

4363

movenc: Factorize writing ftyp and other identification tags to a sep…

Dec 18, 2014

4364

mov_write_ftyp_tag(pb,s);

4365

if (mov->mode == MODE_PSP) {

Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'

Jan 3, 2015

4366

int video_streams_nb = 0, audio_streams_nb = 0, other_streams_nb = 0;

4367

for (i = 0; i < s->nb_streams; i++) {

4368

AVStream *st = s->streams[i];

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4369

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)

Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'

Jan 3, 2015

4370

video_streams_nb++;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4371

else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)

Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'

Jan 3, 2015

4372

audio_streams_nb++;

4373

else

4374

other_streams_nb++;

4375

}

4376

4377

if (video_streams_nb != 1 || audio_streams_nb != 1 || other_streams_nb) {

movenc: Factorize writing ftyp and other identification tags to a sep…

Dec 18, 2014

4378

av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");

4379

return AVERROR(EINVAL);

4380

}

avformat/movenc: Check frame rate in mov_write_uuidprof_tag()

Oct 9, 2016

4381

return mov_write_uuidprof_tag(pb, s);

movenc: Factorize writing ftyp and other identification tags to a sep…

Dec 18, 2014

4382

}

4383

return 0;

4384

}

4385

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

4386

static int mov_parse_mpeg2_frame(AVPacket *pkt, uint32_t *flags)

4387

{

4388

uint32_t c = -1;

4389

int i, closed_gop = 0;

4390

4391

for (i = 0; i < pkt->size - 4; i++) {

movenc: K&R formatting cosmetics

Jul 7, 2013

4392

c = (c << 8) + pkt->data[i];

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

4393

if (c == 0x1b8) { // gop

movenc: K&R formatting cosmetics

Jul 7, 2013

4394

closed_gop = pkt->data[i + 4] >> 6 & 0x01;

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

4395

} else if (c == 0x100) { // pic

movenc: K&R formatting cosmetics

Jul 7, 2013

4396

int temp_ref = (pkt->data[i + 1] << 2) | (pkt->data[i + 2] >> 6);

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

4397

if (!temp_ref || closed_gop) // I picture is not reordered

4398

*flags = MOV_SYNC_SAMPLE;

4399

else

4400

*flags = MOV_PARTIAL_SYNC_SAMPLE;

4401

break;

4402

}

4403

}

4404

return 0;

4405

}

4406

movenc: Don't rely on the fragment index for vc1 info gathering

Jan 20, 2015

4407

static void mov_parse_vc1_frame(AVPacket *pkt, MOVTrack *trk)

movenc: Support muxing VC1

Jan 21, 2012

4408

{

4409

const uint8_t *start, *next, *end = pkt->data + pkt->size;

4410

int seq = 0, entry = 0;

4411

int key = pkt->flags & AV_PKT_FLAG_KEY;

4412

start = find_next_marker(pkt->data, end);

4413

for (next = start; next < end; start = next) {

4414

next = find_next_marker(start + 4, end);

4415

switch (AV_RB32(start)) {

4416

case VC1_CODE_SEQHDR:

4417

seq = 1;

4418

break;

4419

case VC1_CODE_ENTRYPOINT:

4420

entry = 1;

4421

break;

4422

case VC1_CODE_SLICE:

4423

trk->vc1_info.slices = 1;

4424

break;

4425

}

4426

}

movenc: Don't rely on the fragment index for vc1 info gathering

Jan 20, 2015

4427

if (!trk->entry && trk->vc1_info.first_packet_seen)

4428

trk->vc1_info.first_frag_written = 1;

4429

if (!trk->entry && !trk->vc1_info.first_frag_written) {

movenc: Support muxing VC1

Jan 21, 2012

4430

/* First packet in first fragment */

4431

trk->vc1_info.first_packet_seq = seq;

4432

trk->vc1_info.first_packet_entry = entry;

movenc: Don't rely on the fragment index for vc1 info gathering

Jan 20, 2015

4433

trk->vc1_info.first_packet_seen = 1;

movenc: Support muxing VC1

Jan 21, 2012

4434

} else if ((seq && !trk->vc1_info.packet_seq) ||

4435

(entry && !trk->vc1_info.packet_entry)) {

4436

int i;

4437

for (i = 0; i < trk->entry; i++)

4438

trk->cluster[i].flags &= ~MOV_SYNC_SAMPLE;

4439

trk->has_keyframes = 0;

4440

if (seq)

4441

trk->vc1_info.packet_seq = 1;

4442

if (entry)

4443

trk->vc1_info.packet_entry = 1;

movenc: Don't rely on the fragment index for vc1 info gathering

Jan 20, 2015

4444

if (!trk->vc1_info.first_frag_written) {

movenc: Support muxing VC1

Jan 21, 2012

4445

/* First fragment */

4446

if ((!seq || trk->vc1_info.first_packet_seq) &&

4447

(!entry || trk->vc1_info.first_packet_entry)) {

4448

/* First packet had the same headers as this one, readd the

4449

* sync sample flag. */

4450

trk->cluster[0].flags |= MOV_SYNC_SAMPLE;

4451

trk->has_keyframes = 1;

4452

}

4453

}

4454

}

4455

if (trk->vc1_info.packet_seq && trk->vc1_info.packet_entry)

4456

key = seq && entry;

4457

else if (trk->vc1_info.packet_seq)

4458

key = seq;

4459

else if (trk->vc1_info.packet_entry)

4460

key = entry;

4461

if (key) {

4462

trk->cluster[trk->entry].flags |= MOV_SYNC_SAMPLE;

4463

trk->has_keyframes++;

4464

}

4465

}

4466

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4467

static int mov_flush_fragment_interleaving(AVFormatContext *s, MOVTrack *track)

4468

{

4469

MOVMuxContext *mov = s->priv_data;

4470

int ret, buf_size;

4471

uint8_t *buf;

4472

int i, offset;

4473

4474

if (!track->mdat_buf)

4475

return 0;

4476

if (!mov->mdat_buf) {

4477

if ((ret = avio_open_dyn_buf(&mov->mdat_buf)) < 0)

4478

return ret;

4479

}

4480

buf_size = avio_close_dyn_buf(track->mdat_buf, &buf);

4481

track->mdat_buf = NULL;

4482

4483

offset = avio_tell(mov->mdat_buf);

4484

avio_write(mov->mdat_buf, buf, buf_size);

4485

av_free(buf);

4486

4487

for (i = track->entries_flushed; i < track->entry; i++)

4488

track->cluster[i].pos += offset;

4489

track->entries_flushed = track->entry;

4490

return 0;

4491

}

4492

movenc: Honor flush requests with delay_moov, when some tracks lack s…

Oct 20, 2015

4493

static int mov_flush_fragment(AVFormatContext *s, int force)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4494

{

movenc: fragment support

Dec 6, 2011

4495

MOVMuxContext *mov = s->priv_data;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4496

int i, first_track = -1;

4497

int64_t mdat_size = 0;

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

4498

int ret;

movenc: Provide output bytestream markers for fragmented content

May 4, 2016

4499

int has_video = 0, starts_with_key = 0, first_video_track = 1;

movenc: fragment support

Dec 6, 2011

4500

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4501

if (!(mov->flags & FF_MOV_FLAG_FRAGMENT))

4502

return 0;

4503

movenc: Use packets in interleaving queues for the duration at the en…

Apr 20, 2016

4504

// Try to fill in the duration of the last packet in each stream

4505

// from queued packets in the interleave queues. If the flushing

4506

// of fragments was triggered automatically by an AVPacket, we

4507

// already have reliable info for the end of that track, but other

4508

// tracks may need to be filled in.

4509

for (i = 0; i < s->nb_streams; i++) {

4510

MOVTrack *track = &mov->tracks[i];

4511

if (!track->end_reliable) {

movenc: Apply offsets on timestamps when peeking into interleaving qu…

Jun 24, 2016

4512

AVPacket pkt;

4513

if (!ff_interleaved_peek(s, i, &pkt, 1)) {

4514

track->track_duration = pkt.dts - track->start_dts;

4515

if (pkt.pts != AV_NOPTS_VALUE)

4516

track->end_pts = pkt.pts;

movenc: Use packets in interleaving queues for the duration at the en…

Apr 20, 2016

4517

else

movenc: Apply offsets on timestamps when peeking into interleaving qu…

Jun 24, 2016

4518

track->end_pts = pkt.dts;

movenc: Use packets in interleaving queues for the duration at the en…

Apr 20, 2016

4519

}

4520

}

4521

}

4522

movenc: Heuristically set the duration of the last sample in a fragme…

Mar 6, 2015

4523

for (i = 0; i < mov->nb_streams; i++) {

4524

MOVTrack *track = &mov->tracks[i];

4525

if (track->entry <= 1)

4526

continue;

4527

// Sample durations are calculated as the diff of dts values,

4528

// but for the last sample in a fragment, we don't know the dts

4529

// of the first sample in the next fragment, so we have to rely

4530

// on what was set as duration in the AVPacket. Not all callers

4531

// set this though, so we might want to replace it with an

4532

// estimate if it currently is zero.

4533

if (get_cluster_duration(track, track->entry - 1) != 0)

4534

continue;

4535

// Use the duration (i.e. dts diff) of the second last sample for

4536

// the last one. This is a wild guess (and fatal if it turns out

4537

// to be too long), but probably the best we can do - having a zero

4538

// duration is bad as well.

4539

track->track_duration += get_cluster_duration(track, track->entry - 2);

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

4540

track->end_pts += get_cluster_duration(track, track->entry - 2);

movenc: Heuristically set the duration of the last sample in a fragme…

Mar 6, 2015

4541

if (!mov->missing_duration_warned) {

4542

av_log(s, AV_LOG_WARNING,

4543

"Estimating the duration of the last packet in a "

4544

"fragment, consider setting the duration field in "

4545

"AVPacket instead.\n");

4546

mov->missing_duration_warned = 1;

4547

}

4548

}

4549

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

4550

if (!mov->moov_written) {

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4551

int64_t pos = avio_tell(s->pb);

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4552

uint8_t *buf;

lavf/movenc: add get_moov_size and use it in fragment code.

Sep 20, 2012

4553

int buf_size, moov_size;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4554

4555

for (i = 0; i < mov->nb_streams; i++)

4556

if (!mov->tracks[i].entry)

4557

break;

4558

/* Don't write the initial moov unless all tracks have data */

movenc: Honor flush requests with delay_moov, when some tracks lack s…

Oct 20, 2015

4559

if (i < mov->nb_streams && !force)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4560

return 0;

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4561

lavf/movenc: add get_moov_size and use it in fragment code.

Sep 20, 2012

4562

moov_size = get_moov_size(s);

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4563

for (i = 0; i < mov->nb_streams; i++)

lavf/movenc: add get_moov_size and use it in fragment code.

Sep 20, 2012

4564

mov->tracks[i].data_offset = pos + moov_size + 8;

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4565

movenc: Provide output bytestream markers for fragmented content

May 4, 2016

4566

avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4567

if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)

4568

mov_write_identification(s->pb, s);

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

4569

if ((ret = mov_write_moov_tag(s->pb, mov, s)) < 0)

4570

return ret;

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4571

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4572

if (mov->flags & FF_MOV_FLAG_DELAY_MOOV) {

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

4573

if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)

movenc: Rename reserved_moov_pos to reserved_header_pos

Aug 9, 2015

4574

mov->reserved_header_pos = avio_tell(s->pb);

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4575

avio_flush(s->pb);

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

4576

mov->moov_written = 1;

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4577

return 0;

4578

}

4579

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4580

buf_size = avio_close_dyn_buf(mov->mdat_buf, &buf);

4581

mov->mdat_buf = NULL;

4582

avio_wb32(s->pb, buf_size + 8);

4583

ffio_wfourcc(s->pb, "mdat");

4584

avio_write(s->pb, buf, buf_size);

4585

av_free(buf);

4586

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

4587

if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)

movenc: Place the sidx index after the initial moov/mdat pair

Aug 9, 2015

4588

mov->reserved_header_pos = avio_tell(s->pb);

4589

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

4590

mov->moov_written = 1;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4591

mov->mdat_size = 0;

4592

for (i = 0; i < mov->nb_streams; i++) {

4593

if (mov->tracks[i].entry)

4594

mov->tracks[i].frag_start += mov->tracks[i].start_dts +

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4595

mov->tracks[i].track_duration -

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4596

mov->tracks[i].cluster[0].dts;

4597

mov->tracks[i].entry = 0;

movenc: Use packets in interleaving queues for the duration at the en…

Apr 20, 2016

4598

mov->tracks[i].end_reliable = 0;

movenc: fragment support

Dec 6, 2011

4599

}

movenc: Allow writing to a non-seekable output if using empty moov

Jan 19, 2012

4600

avio_flush(s->pb);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4601

return 0;

movenc: fragment support

Dec 6, 2011

4602

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4603

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4604

if (mov->frag_interleave) {

4605

for (i = 0; i < mov->nb_streams; i++) {

4606

MOVTrack *track = &mov->tracks[i];

4607

int ret;

4608

if ((ret = mov_flush_fragment_interleaving(s, track)) < 0)

4609

return ret;

4610

}

4611

4612

if (!mov->mdat_buf)

4613

return 0;

4614

mdat_size = avio_tell(mov->mdat_buf);

4615

}

4616

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4617

for (i = 0; i < mov->nb_streams; i++) {

4618

MOVTrack *track = &mov->tracks[i];

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4619

if (mov->flags & FF_MOV_FLAG_SEPARATE_MOOF || mov->frag_interleave)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4620

track->data_offset = 0;

4621

else

4622

track->data_offset = mdat_size;

movenc: Provide output bytestream markers for fragmented content

May 4, 2016

4623

if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) {

4624

has_video = 1;

4625

if (first_video_track) {

4626

if (track->entry)

4627

starts_with_key = track->cluster[0].flags & MOV_SYNC_SAMPLE;

4628

first_video_track = 0;

4629

}

4630

}

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4631

if (!track->entry)

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4632

continue;

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4633

if (track->mdat_buf)

4634

mdat_size += avio_tell(track->mdat_buf);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4635

if (first_track < 0)

4636

first_track = i;

movenc: fragment support

Dec 6, 2011

4637

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4638

4639

if (!mdat_size)

4640

return 0;

4641

movenc: Provide output bytestream markers for fragmented content

May 4, 2016

4642

avio_write_marker(s->pb,

4643

                      av_rescale(mov->tracks[first_track].cluster[0].dts, AV_TIME_BASE, mov->tracks[first_track].timescale),

4644

                      (has_video ? starts_with_key : mov->tracks[first_track].cluster[0].flags & MOV_SYNC_SAMPLE) ? AVIO_DATA_MARKER_SYNC_POINT : AVIO_DATA_MARKER_BOUNDARY_POINT);

4645

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4646

for (i = 0; i < mov->nb_streams; i++) {

4647

MOVTrack *track = &mov->tracks[i];

4648

int buf_size, write_moof = 1, moof_tracks = -1;

4649

uint8_t *buf;

4650

int64_t duration = 0;

4651

4652

if (track->entry)

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4653

duration = track->start_dts + track->track_duration -

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4654

track->cluster[0].dts;

4655

if (mov->flags & FF_MOV_FLAG_SEPARATE_MOOF) {

4656

if (!track->mdat_buf)

4657

continue;

4658

mdat_size = avio_tell(track->mdat_buf);

4659

moof_tracks = i;

4660

} else {

4661

write_moof = i == first_track;

4662

}

4663

4664

if (write_moof) {

movenc: Allow writing to a non-seekable output if using empty moov

Jan 19, 2012

4665

avio_flush(s->pb);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4666

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

4667

mov_write_moof_tag(s->pb, mov, moof_tracks, mdat_size);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4668

mov->fragments++;

4669

4670

avio_wb32(s->pb, mdat_size + 8);

4671

ffio_wfourcc(s->pb, "mdat");

4672

}

4673

4674

if (track->entry)

4675

track->frag_start += duration;

4676

track->entry = 0;

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4677

track->entries_flushed = 0;

movenc: Use packets in interleaving queues for the duration at the en…

Apr 20, 2016

4678

track->end_reliable = 0;

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4679

if (!mov->frag_interleave) {

4680

if (!track->mdat_buf)

4681

continue;

4682

buf_size = avio_close_dyn_buf(track->mdat_buf, &buf);

4683

track->mdat_buf = NULL;

4684

} else {

4685

if (!mov->mdat_buf)

4686

continue;

4687

buf_size = avio_close_dyn_buf(mov->mdat_buf, &buf);

4688

mov->mdat_buf = NULL;

4689

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4690

4691

avio_write(s->pb, buf, buf_size);

4692

av_free(buf);

4693

}

4694

4695

mov->mdat_size = 0;

movenc: fragment support

Dec 6, 2011

4696

movenc: Allow writing to a non-seekable output if using empty moov

Jan 19, 2012

4697

avio_flush(s->pb);

movenc: fragment support

Dec 6, 2011

4698

return 0;

4699

}

4700

movenc: Honor flush requests with delay_moov, when some tracks lack s…

Oct 20, 2015

4701

static int mov_auto_flush_fragment(AVFormatContext *s, int force)

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4702

{

4703

MOVMuxContext *mov = s->priv_data;

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

4704

int had_moov = mov->moov_written;

movenc: Honor flush requests with delay_moov, when some tracks lack s…

Oct 20, 2015

4705

int ret = mov_flush_fragment(s, force);

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4706

if (ret < 0)

4707

return ret;

4708

// If using delay_moov, the first flush only wrote the moov,

4709

// not the actual moof+mdat pair, thus flush once again.

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

4710

if (!had_moov && mov->flags & FF_MOV_FLAG_DELAY_MOOV)

movenc: Honor flush requests with delay_moov, when some tracks lack s…

Oct 20, 2015

4711

ret = mov_flush_fragment(s, force);

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4712

return ret;

4713

}

4714

avformat/movenc: Factor check_pkt() out

Sep 15, 2016

4715

static int check_pkt(AVFormatContext *s, AVPacket *pkt)

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

4716

{

Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is alre…

Feb 28, 2009

4717

MOVMuxContext *mov = s->priv_data;

clean and simplify

May 13, 2006

4718

MOVTrack *trk = &mov->tracks[pkt->stream_index];

avformat/movenc: Make the packet check more tolerant

Sep 15, 2016

4719

int64_t ref;

4720

uint64_t duration;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4721

avformat/movenc: check that the input timestamps are within the range…

Feb 21, 2014

4722

if (trk->entry) {

avformat/movenc: Make the packet check more tolerant

Sep 15, 2016

4723

ref = trk->cluster[trk->entry - 1].dts;

avformat/movenc: Skip duration check for discontinuous fragments

Oct 18, 2016

4724

} else if ( trk->start_dts != AV_NOPTS_VALUE

4725

&& !trk->frag_discont) {

avformat/movenc: Make the packet check more tolerant

Sep 15, 2016

4726

ref = trk->start_dts + trk->track_duration;

4727

} else

4728

ref = pkt->dts; // Skip tests for the first packet

avformat/movenc: Check first DTS similar to dts difference

Sep 9, 2016

4729

avformat/movenc: Make the packet check more tolerant

Sep 15, 2016

4730

duration = pkt->dts - ref;

4731

if (pkt->dts < ref || duration >= INT_MAX) {

4732

        av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" / timestamp: %"PRId64" is out of range for mov/mp4 format\n",

4733

duration, pkt->dts

4734

);

4735

4736

pkt->dts = ref + 1;

4737

pkt->pts = AV_NOPTS_VALUE;

avformat/movenc: Check that pkt duration is within 32bit range

Jan 9, 2016

4738

}

avformat/movenc: Make the packet check more tolerant

Sep 15, 2016

4739

avformat/movenc: Check that pkt duration is within 32bit range

Jan 9, 2016

4740

if (pkt->duration < 0 || pkt->duration > INT_MAX) {

4741

        av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" is invalid\n", pkt->duration);

4742

return AVERROR(EINVAL);

avformat/movenc: check that the input timestamps are within the range…

Feb 21, 2014

4743

}

avformat/movenc: Factor check_pkt() out

Sep 15, 2016

4744

return 0;

4745

}

4746

4747

int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)

4748

{

4749

MOVMuxContext *mov = s->priv_data;

4750

AVIOContext *pb = s->pb;

4751

MOVTrack *trk = &mov->tracks[pkt->stream_index];

4752

AVCodecParameters *par = trk->par;

4753

unsigned int samples_in_chunk = 0;

4754

int size = pkt->size, ret = 0;

4755

uint8_t *reformatted_data = NULL;

4756

4757

ret = check_pkt(s, pkt);

4758

if (ret < 0)

4759

return ret;

4760

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4761

if (mov->flags & FF_MOV_FLAG_FRAGMENT) {

4762

int ret;

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

4763

if (mov->moov_written || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

4764

if (mov->frag_interleave && mov->fragments > 0) {

4765

if (trk->entry - trk->entries_flushed >= mov->frag_interleave) {

4766

if ((ret = mov_flush_fragment_interleaving(s, trk)) < 0)

4767

return ret;

4768

}

4769

}

4770

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

4771

if (!trk->mdat_buf) {

4772

if ((ret = avio_open_dyn_buf(&trk->mdat_buf)) < 0)

4773

return ret;

4774

}

4775

pb = trk->mdat_buf;

4776

} else {

4777

if (!mov->mdat_buf) {

4778

if ((ret = avio_open_dyn_buf(&mov->mdat_buf)) < 0)

4779

return ret;

4780

}

4781

pb = mov->mdat_buf;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4782

}

movenc: fragment support

Dec 6, 2011

4783

}

4784

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4785

if (par->codec_id == AV_CODEC_ID_AMR_NB) {

write exact values for audio stsd v1

Jul 4, 2006

4786

/* We must find out how many AMR blocks there are in one packet */

avformat/movenc: Make static packed_size, const static

Jun 10, 2015

4787

static const uint16_t packed_size[16] =

Fix AMR block length for no data mode when muxing mov.

Oct 19, 2011

4788

{13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 1};

write exact values for audio stsd v1

Jul 4, 2006

4789

int len = 0;

4790

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4791

while (len < size && samples_in_chunk < 100) {

write exact values for audio stsd v1

Jul 4, 2006

4792

len += packed_size[(pkt->data[len] >> 3) & 0x0F];

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4793

samples_in_chunk++;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

4794

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4795

if (samples_in_chunk > 1) {

Typo

Sep 11, 2007

4796

            av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, implement a AVParser for it\n");

check for unparsed AMR input

Jul 6, 2006

4797

return -1;

4798

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4799

} else if (par->codec_id == AV_CODEC_ID_ADPCM_MS ||

4800

par->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) {

4801

samples_in_chunk = trk->par->frame_size;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4802

} else if (trk->sample_size)

4803

samples_in_chunk = size / trk->sample_size;

write exact values for audio stsd v1

Jul 4, 2006

4804

else

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4805

samples_in_chunk = 1;

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

4806

clean and simplify mov_write_packet

Apr 14, 2006

4807

/* copy extradata if it exists */

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4808

if (trk->vos_len == 0 && par->extradata_size > 0 &&

avformat/movenc: Fix writing ACLR atoms for DNxHD

Feb 24, 2015

4809

!TAG_IS_AVCI(trk->tag) &&

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4810

(par->codec_id != AV_CODEC_ID_DNXHD)) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4811

trk->vos_len = par->extradata_size;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4812

trk->vos_data = av_malloc(trk->vos_len);

movenc: Check memory allocations

Feb 1, 2015

4813

if (!trk->vos_data) {

4814

ret = AVERROR(ENOMEM);

4815

goto err;

4816

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4817

memcpy(trk->vos_data, par->extradata, trk->vos_len);

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

4818

}

4819

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4820

if (par->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 &&

Write broken aac frames to mov files instead of skipping them.

Mar 30, 2013

4821

(AV_RB16(pkt->data) & 0xfff0) == 0xfff0) {

4822

if (!s->streams[pkt->stream_index]->nb_frames) {

lavf/movenc: improve error feedback in case malformed AAC bitstream i…

Jun 26, 2013

4823

av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: "

align and correct messages regarding bitstream filters

Aug 19, 2014

4824

"use the audio bitstream filter 'aac_adtstoasc' to fix it "

lavf/movenc: improve error feedback in case malformed AAC bitstream i…

Jun 26, 2013

4825

"('-bsf:a aac_adtstoasc' option with ffmpeg)\n");

Write broken aac frames to mov files instead of skipping them.

Mar 30, 2013

4826

return -1;

4827

}

4828

av_log(s, AV_LOG_WARNING, "aac bitstream error\n");

4829

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4830

    if (par->codec_id == AV_CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1 && !TAG_IS_AVCI(trk->tag)) {

cosmetics: Fix spelling mistakes

Apr 27, 2016

4831

/* from x264 or from bytestream H.264 */

4832

/* NAL reformatting needed */

movenc: Use the actual converted sample for RTP hinting

Dec 9, 2011

4833

if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) {

4834

ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data,

4835

&size);

4836

avio_write(pb, reformatted_data, size);

4837

} else {

movenc: support cenc (common encryption)

Dec 7, 2015

4838

if (mov->encryption_scheme == MOV_ENC_CENC_AES_CTR) {

4839

size = ff_mov_cenc_avc_parse_nal_units(&trk->cenc, pb, pkt->data, size);

4840

if (size < 0) {

4841

ret = size;

4842

goto err;

4843

}

4844

} else {

4845

size = ff_avc_parse_nal_units(pb, pkt->data, pkt->size);

4846

}

movenc: Use the actual converted sample for RTP hinting

Dec 9, 2011

4847

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4848

} else if (par->codec_id == AV_CODEC_ID_HEVC && trk->vos_len > 6 &&

movenc: enable Annex B to MP4 conversion for HEVC tracks.

Mar 3, 2014

4849

(AV_RB24(trk->vos_data) == 1 || AV_RB32(trk->vos_data) == 1)) {

4850

/* extradata is Annex B, assume the bitstream is too and convert it */

4851

if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) {

4852

ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data, &size, 0, NULL);

4853

avio_write(pb, reformatted_data, size);

4854

} else {

4855

size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL);

4856

}

Fix standalone compilation of the mov muxer with --disable-optimizati…

Feb 8, 2015

4857

#if CONFIG_AC3_PARSER

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4858

} else if (par->codec_id == AV_CODEC_ID_EAC3) {

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

4859

size = handle_eac3(mov, pkt, trk);

4860

if (size < 0)

4861

return size;

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

4862

else if (!size)

4863

goto end;

avformat/movenc: add EAC3 muxing support.

Oct 7, 2014

4864

avio_write(pb, pkt->data, size);

Fix standalone compilation of the mov muxer with --disable-optimizati…

Feb 8, 2015

4865

#endif

move actual writing before so new size can be taken into account

Jan 16, 2009

4866

} else {

movenc: support cenc (common encryption)

Dec 7, 2015

4867

if (mov->encryption_scheme == MOV_ENC_CENC_AES_CTR) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

4868

if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 4) {

4869

int nal_size_length = (par->extradata[4] & 0x3) + 1;

movenc: support cenc (common encryption)

Dec 7, 2015

4870

                ret = ff_mov_cenc_avc_write_nal_units(s, &trk->cenc, nal_size_length, pb, pkt->data, size);

4871

} else {

4872

ret = ff_mov_cenc_write_packet(&trk->cenc, pb, pkt->data, size);

4873

}

4874

4875

if (ret) {

4876

goto err;

4877

}

4878

} else {

4879

avio_write(pb, pkt->data, size);

4880

}

move actual writing before so new size can be taken into account

Jan 16, 2009

4881

}

4882

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4883

if ((par->codec_id == AV_CODEC_ID_DNXHD ||

4884

par->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len) {

copy whole frame in vosData for dnxhd, this code will be used for oth…

Aug 31, 2008

4885

/* copy frame to create needed atoms */

movenc: K&R formatting cosmetics

Jul 7, 2013

4886

trk->vos_len = size;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4887

trk->vos_data = av_malloc(size);

movenc: Avoid leaking locally allocated data when returning on errors

Nov 2, 2014

4888

if (!trk->vos_data) {

4889

ret = AVERROR(ENOMEM);

4890

goto err;

4891

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4892

memcpy(trk->vos_data, pkt->data, size);

do nal reformating when muxing H264, create avcc atom

Mar 11, 2006

4893

}

4894

movenc: Keep track of the allocated size for the cluster array

Jun 2, 2013

4895

if (trk->entry >= trk->cluster_capacity) {

movenc: K&R formatting cosmetics

Jul 7, 2013

4896

unsigned new_capacity = 2 * (trk->entry + MOV_INDEX_CLUSTER_SIZE);

movenc: Keep track of the allocated size for the cluster array

Jun 2, 2013

4897

if (av_reallocp_array(&trk->cluster, new_capacity,

movenc: Avoid leaking locally allocated data when returning on errors

Nov 2, 2014

4898

sizeof(*trk->cluster))) {

4899

ret = AVERROR(ENOMEM);

4900

goto err;

4901

}

movenc: Keep track of the allocated size for the cluster array

Jun 2, 2013

4902

trk->cluster_capacity = new_capacity;

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

4903

}

4904

movenc: K&R formatting cosmetics

Jul 7, 2013

4905

trk->cluster[trk->entry].pos = avio_tell(pb) - size;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4906

trk->cluster[trk->entry].samples_in_chunk = samples_in_chunk;

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

4907

trk->cluster[trk->entry].chunkNum = 0;

movenc: K&R formatting cosmetics

Jul 7, 2013

4908

trk->cluster[trk->entry].size = size;

4909

trk->cluster[trk->entry].entries = samples_in_chunk;

4910

trk->cluster[trk->entry].dts = pkt->dts;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4911

if (!trk->entry && trk->start_dts != AV_NOPTS_VALUE) {

movenc: Add a flag for indicating a discontinuous fragment

Nov 20, 2014

4912

if (!trk->frag_discont) {

4913

/* First packet of a new fragment. We already wrote the duration

4914

* of the last packet of the previous fragment based on track_duration,

4915

* which might not exactly match our dts. Therefore adjust the dts

4916

* of this packet to be what the previous packets duration implies. */

4917

trk->cluster[trk->entry].dts = trk->start_dts + trk->track_duration;

movenc: Adjust the pts of new fragments similarly to what is done for…

Nov 23, 2014

4918

/* We also may have written the pts and the corresponding duration

movenc: Only adjust the cts offset at the start of fragments if neces…

Mar 15, 2015

4919

* in sidx/tfrf/tfxd tags; make sure the sidx pts and duration match up with

movenc: Adjust the pts of new fragments similarly to what is done for…

Nov 23, 2014

4920

* the next fragment. This means the cts of the first sample must

movenc: Update a comment to reflect how the code actually behaves

Apr 19, 2016

4921

* be the same in all fragments, unless end_pts was updated by

4922

* the packet causing the fragment to be written. */

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

4923

            if ((mov->flags & FF_MOV_FLAG_DASH && !(mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)) ||

movenc: Only adjust the cts offset at the start of fragments if neces…

Mar 15, 2015

4924

mov->mode == MODE_ISM)

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

4925

pkt->pts = pkt->dts + trk->end_pts - trk->cluster[trk->entry].dts;

movenc: Add a flag for indicating a discontinuous fragment

Nov 20, 2014

4926

} else {

4927

/* New fragment, but discontinuous from previous fragments.

4928

* Pretend the duration sum of the earlier fragments is

4929

* pkt->dts - trk->start_dts. */

4930

trk->frag_start = pkt->dts - trk->start_dts;

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

4931

trk->end_pts = AV_NOPTS_VALUE;

movenc: Add a flag for indicating a discontinuous fragment

Nov 20, 2014

4932

trk->frag_discont = 0;

4933

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

4934

}

Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'

Nov 7, 2014

4935

movenc: Allow to request not to use edit lists

Nov 4, 2014

4936

if (!trk->entry && trk->start_dts == AV_NOPTS_VALUE && !mov->use_editlist &&

4937

s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_MAKE_ZERO) {

4938

/* Not using edit lists and shifting the first track to start from zero.

4939

* If the other streams start from a later timestamp, we won't be able

4940

* to signal the difference in starting time without an edit list.

4941

* Thus move the timestamp for this first sample to 0, increasing

4942

* its duration instead. */

movenc: support an alternative to edit lists to handle the first DTS …

Sep 29, 2012

4943

trk->cluster[trk->entry].dts = trk->start_dts = 0;

4944

}

movenc: Print a warning for an unhandled case of nonzero start dts wi…

Oct 11, 2014

4945

if (trk->start_dts == AV_NOPTS_VALUE) {

movenc: Add a separate start_pts

Jan 6, 2012

4946

trk->start_dts = pkt->dts;

movenc: Add a flag for indicating a discontinuous fragment

Nov 20, 2014

4947

if (trk->frag_discont) {

movenc: Assume streams starting at pts=0 for discontinuous fragments …

Jan 5, 2015

4948

if (mov->use_editlist) {

4949

/* Pretend the whole stream started at pts=0, with earlier fragments

4950

* already written. If the stream started at pts=0, the duration sum

4951

* of earlier fragments would have been pkt->pts. */

4952

trk->frag_start = pkt->pts;

4953

trk->start_dts = pkt->dts - pkt->pts;

4954

} else {

4955

/* Pretend the whole stream started at dts=0, with earlier fragments

4956

* already written, with a duration summing up to pkt->dts. */

4957

trk->frag_start = pkt->dts;

4958

trk->start_dts = 0;

4959

}

movenc: Add a flag for indicating a discontinuous fragment

Nov 20, 2014

4960

trk->frag_discont = 0;

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

4961

} else if (pkt->dts && mov->moov_written)

movenc: Print a warning for an unhandled case of nonzero start dts wi…

Oct 11, 2014

4962

av_log(s, AV_LOG_WARNING,

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

4963

"Track %d starts with a nonzero dts %"PRId64", while the moov "

4964

"already has been written. Set the delay_moov flag to handle "

4965

"this case.\n",

4966

pkt->stream_index, pkt->dts);

movenc: Print a warning for an unhandled case of nonzero start dts wi…

Oct 11, 2014

4967

}

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

4968

trk->track_duration = pkt->dts - trk->start_dts + pkt->duration;

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

4969

trk->last_sample_is_subtitle_end = 0;

mov vfr muxing

Nov 1, 2006

4970

warn if pts is not set, prevent writing negative/weird cts, happens w…

May 29, 2008

4971

if (pkt->pts == AV_NOPTS_VALUE) {

4972

av_log(s, AV_LOG_WARNING, "pts has no value\n");

4973

pkt->pts = pkt->dts;

4974

}

reindent

May 29, 2008

4975

if (pkt->dts != pkt->pts)

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

4976

trk->flags |= MOV_TRACK_CTTS;

movenc: K&R formatting cosmetics

Jul 7, 2013

4977

trk->cluster[trk->entry].cts = pkt->pts - pkt->dts;

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

4978

trk->cluster[trk->entry].flags = 0;

movenc: Adjust the pts of new fragments similarly to what is done for…

Nov 23, 2014

4979

if (trk->start_cts == AV_NOPTS_VALUE)

4980

trk->start_cts = pkt->pts - pkt->dts;

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

4981

if (trk->end_pts == AV_NOPTS_VALUE)

4982

trk->end_pts = trk->cluster[trk->entry].dts +

4983

trk->cluster[trk->entry].cts + pkt->duration;

4984

else

4985

trk->end_pts = FFMAX(trk->end_pts, trk->cluster[trk->entry].dts +

4986

trk->cluster[trk->entry].cts +

4987

pkt->duration);

movenc: Adjust the pts of new fragments similarly to what is done for…

Nov 23, 2014

4988

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4989

if (par->codec_id == AV_CODEC_ID_VC1) {

movenc: Don't rely on the fragment index for vc1 info gathering

Jan 20, 2015

4990

mov_parse_vc1_frame(pkt, trk);

movenc: Support muxing VC1

Jan 21, 2012

4991

} else if (pkt->flags & AV_PKT_FLAG_KEY) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

4992

if (mov->mode == MODE_MOV && par->codec_id == AV_CODEC_ID_MPEG2VIDEO &&

movenc: Force first sample as SYNC

Feb 13, 2011

4993

trk->entry > 0) { // force sync sample for the first key frame

write 'stps' for mpeg-2 open gop in .mov

May 15, 2009

4994

mov_parse_mpeg2_frame(pkt, &trk->cluster[trk->entry].flags);

4995

if (trk->cluster[trk->entry].flags & MOV_PARTIAL_SYNC_SAMPLE)

4996

trk->flags |= MOV_TRACK_STPS;

4997

} else {

4998

trk->cluster[trk->entry].flags = MOV_SYNC_SAMPLE;

4999

}

5000

if (trk->cluster[trk->entry].flags & MOV_SYNC_SAMPLE)

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

5001

trk->has_keyframes++;

use flags field and remove key_frame field

May 14, 2009

5002

}

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

5003

trk->entry++;

movenc: cosmetics: Get rid of camelCase identifiers

Jan 30, 2012

5004

trk->sample_count += samples_in_chunk;

movenc: K&R formatting cosmetics

Jul 7, 2013

5005

mov->mdat_size += size;

movenc patch by (Gildas Bazin <gbazin at altern dot org>)

Nov 3, 2003

5006

Add initial support for RTP hinting in the mov muxer

May 18, 2010

5007

if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)

movenc: Use the actual converted sample for RTP hinting

Dec 9, 2011

5008

ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,

5009

reformatted_data, size);

movenc: Avoid leaking locally allocated data when returning on errors

Nov 2, 2014

5010

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Oct 13, 2014

5011

end:

movenc: Avoid leaking locally allocated data when returning on errors

Nov 2, 2014

5012

err:

Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'

Nov 8, 2014

5013

movenc: Use the actual converted sample for RTP hinting

Dec 9, 2011

5014

av_free(reformatted_data);

movenc: Avoid leaking locally allocated data when returning on errors

Nov 2, 2014

5015

return ret;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

5016

}

5017

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5018

static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt)

movenc: Allow the caller to decide on fragmentation

Jan 20, 2012

5019

{

movenc: small refactor mov_write_packet

Apr 11, 2012

5020

MOVMuxContext *mov = s->priv_data;

5021

MOVTrack *trk = &mov->tracks[pkt->stream_index];

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5022

AVCodecParameters *par = trk->par;

movenc: small refactor mov_write_packet

Apr 11, 2012

5023

int64_t frag_duration = 0;

5024

int size = pkt->size;

5025

avformat/movenc: Check packet in mov_write_single_packet() too

Sep 15, 2016

5026

int ret = check_pkt(s, pkt);

5027

if (ret < 0)

5028

return ret;

5029

movenc: Add a flag for indicating a discontinuous fragment

Nov 20, 2014

5030

if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) {

5031

int i;

5032

for (i = 0; i < s->nb_streams; i++)

5033

mov->tracks[i].frag_discont = 1;

5034

mov->flags &= ~FF_MOV_FLAG_FRAG_DISCONT;

5035

}

5036

movenc: Allow setting start_dts/start_cts before writing actual packets

Nov 3, 2015

5037

if (!pkt->size) {

5038

if (trk->start_dts == AV_NOPTS_VALUE && trk->frag_discont) {

5039

trk->start_dts = pkt->dts;

5040

if (pkt->pts != AV_NOPTS_VALUE)

5041

trk->start_cts = pkt->pts - pkt->dts;

5042

else

5043

trk->start_cts = 0;

5044

}

5045

avformat/movenc: allow rewriting extradata

Aug 17, 2016

5046

if (trk->par->codec_id == AV_CODEC_ID_MP4ALS) {

5047

int side_size = 0;

5048

                uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size);

5049

                if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) {

avformat/movenc: Free extradata after successfull allocation of new i…

Aug 19, 2016

5050

void *newextra = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE);

5051

if (!newextra)

avformat/movenc: allow rewriting extradata

Aug 17, 2016

5052

return AVERROR(ENOMEM);

avformat/movenc: Free extradata after successfull allocation of new i…

Aug 19, 2016

5053

av_free(par->extradata);

5054

par->extradata = newextra;

avformat/movenc: allow rewriting extradata

Aug 17, 2016

5055

memcpy(par->extradata, side, side_size);

5056

par->extradata_size = side_size;

5057

mov->need_rewrite_extradata = 1;

5058

}

5059

}

5060

movenc: Allow setting start_dts/start_cts before writing actual packets

Nov 3, 2015

5061

return 0; /* Discard 0 sized packets */

5062

}

5063

Merge remote-tracking branch 'qatar/master'

Apr 11, 2012

5064

if (trk->entry && pkt->stream_index < s->nb_streams)

movenc: small refactor mov_write_packet

Apr 11, 2012

5065

frag_duration = av_rescale_q(pkt->dts - trk->cluster[0].dts,

5066

s->streams[pkt->stream_index]->time_base,

5067

AV_TIME_BASE_Q);

5068

if ((mov->max_fragment_duration &&

5069

frag_duration >= mov->max_fragment_duration) ||

5070

(mov->max_fragment_size && mov->mdat_size + size >= mov->max_fragment_size) ||

5071

(mov->flags & FF_MOV_FLAG_FRAG_KEYFRAME &&

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5072

par->codec_type == AVMEDIA_TYPE_VIDEO &&

movenc: small refactor mov_write_packet

Apr 11, 2012

5073

trk->entry && pkt->flags & AV_PKT_FLAG_KEY)) {

movenc: Set the last packet duration based on the next packet when au…

Mar 9, 2015

5074

if (frag_duration >= mov->min_fragment_duration) {

5075

// Set the duration of this track to line up with the next

5076

// sample in this track. This avoids relying on AVPacket

5077

// duration, but only helps for this particular track, not

5078

// for the other ones that are flushed at the same time.

5079

trk->track_duration = pkt->dts - trk->start_dts;

movenc: Handle pts == NOPTS when autoflushing

Apr 20, 2016

5080

if (pkt->pts != AV_NOPTS_VALUE)

5081

trk->end_pts = pkt->pts;

5082

else

5083

trk->end_pts = pkt->dts;

movenc: Use packets in interleaving queues for the duration at the en…

Apr 20, 2016

5084

trk->end_reliable = 1;

movenc: Honor flush requests with delay_moov, when some tracks lack s…

Oct 20, 2015

5085

mov_auto_flush_fragment(s, 0);

movenc: Set the last packet duration based on the next packet when au…

Mar 9, 2015

5086

}

movenc: small refactor mov_write_packet

Apr 11, 2012

5087

}

5088

5089

return ff_mov_write_packet(s, pkt);

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5090

}

5091

5092

static int mov_write_subtitle_end_packet(AVFormatContext *s,

5093

int stream_index,

5094

int64_t dts) {

5095

AVPacket end;

lavf/movenc: use two explicit bytes instead of a short.

Aug 8, 2012

5096

uint8_t data[2] = {0};

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5097

int ret;

5098

5099

av_init_packet(&end);

lavf/movenc: use two explicit bytes instead of a short.

Aug 8, 2012

5100

end.size = sizeof(data);

5101

end.data = data;

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5102

end.pts = dts;

5103

end.dts = dts;

5104

end.duration = 0;

5105

end.stream_index = stream_index;

5106

5107

ret = mov_write_single_packet(s, &end);

Replace remaining occurances of av_free_packet with av_packet_unref

Oct 27, 2015

5108

av_packet_unref(&end);

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5109

5110

return ret;

5111

}

5112

5113

static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)

5114

{

5115

if (!pkt) {

Merge commit '5ea5a24eb70646a9061b85af407fcbb5dd4f89fd'

Oct 27, 2015

5116

mov_flush_fragment(s, 1);

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5117

return 1;

5118

} else {

5119

int i;

5120

MOVMuxContext *mov = s->priv_data;

lavf/movenc: Add palette to video sample description

Feb 26, 2016

5121

MOVTrack *trk = &mov->tracks[pkt->stream_index];

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5122

Merge commit 'bef3b1f59f036aba4a5fe599b2480f6bd9e6b280'

Nov 18, 2015

5123

if (!pkt->size)

5124

return mov_write_single_packet(s, pkt); /* Passthrough. */

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5125

5126

/*

5127

* Subtitles require special handling.

5128

*

5129

* 1) For full complaince, every track must have a sample at

5130

* dts == 0, which is rarely true for subtitles. So, as soon

5131

* as we see any packet with dts > 0, write an empty subtitle

5132

* at dts == 0 for any subtitle track with no samples in it.

5133

*

5134

* 2) For each subtitle track, check if the current packet's

5135

* dts is past the duration of the last subtitle sample. If

5136

* so, we now need to write an end sample for that subtitle.

5137

*

5138

* This must be done conditionally to allow for subtitles that

5139

* immediately replace each other, in which case an end sample

5140

* is not needed, and is, in fact, actively harmful.

5141

*

5142

* 3) See mov_write_trailer for how the final end sample is

5143

* handled.

5144

*/

5145

for (i = 0; i < mov->nb_streams; i++) {

5146

MOVTrack *trk = &mov->tracks[i];

5147

int ret;

5148

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5149

if (trk->par->codec_id == AV_CODEC_ID_MOV_TEXT &&

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5150

trk->track_duration < pkt->dts &&

5151

(trk->entry == 0 || !trk->last_sample_is_subtitle_end)) {

5152

ret = mov_write_subtitle_end_packet(s, i, trk->track_duration);

5153

if (ret < 0) return ret;

5154

trk->last_sample_is_subtitle_end = 1;

5155

}

5156

}

5157

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5158

if (trk->mode == MODE_MOV && trk->par->codec_type == AVMEDIA_TYPE_VIDEO) {

lavf/movenc: Add support for palette side data

Mar 2, 2016

5159

AVPacket *opkt = pkt;

avformat/movenc: Rename reshuffles return variable to ensure it is no…

May 28, 2016

5160

int reshuffle_ret, ret;

lavf/movenc: Add support for palette side data

Mar 2, 2016

5161

if (trk->is_unaligned_qt_rgb) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5162

                int64_t bpc = trk->par->bits_per_coded_sample != 15 ? trk->par->bits_per_coded_sample : 16;

5163

int expected_stride = ((trk->par->width * bpc + 15) >> 4)*2;

avformat/movenc: Rename reshuffles return variable to ensure it is no…

May 28, 2016

5164

reshuffle_ret = ff_reshuffle_raw_rgb(s, &pkt, trk->par, expected_stride);

5165

if (reshuffle_ret < 0)

5166

return reshuffle_ret;

lavf/movenc: Add support for palette side data

Mar 2, 2016

5167

} else

avformat/movenc: Rename reshuffles return variable to ensure it is no…

May 28, 2016

5168

reshuffle_ret = 0;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5169

if (trk->par->format == AV_PIX_FMT_PAL8 && !trk->pal_done) {

avformat/movenc: Rename reshuffles return variable to ensure it is no…

May 28, 2016

5170

ret = ff_get_packet_palette(s, opkt, reshuffle_ret, trk->palette);

5171

if (ret < 0)

avformat/movenc: Fix memleak of reshuffled packet

May 28, 2016

5172

goto fail;

avformat/movenc: Rename reshuffles return variable to ensure it is no…

May 28, 2016

5173

if (ret)

lavf/movenc: Add support for palette side data

Mar 2, 2016

5174

trk->pal_done++;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5175

} else if (trk->par->codec_id == AV_CODEC_ID_RAWVIDEO &&

5176

(trk->par->format == AV_PIX_FMT_GRAY8 ||

5177

trk->par->format == AV_PIX_FMT_MONOBLACK)) {

lavf/movenc: Add palette to video sample description

Feb 26, 2016

5178

for (i = 0; i < pkt->size; i++)

5179

pkt->data[i] = ~pkt->data[i];

5180

}

avformat/movenc: Rename reshuffles return variable to ensure it is no…

May 28, 2016

5181

if (reshuffle_ret) {

lavf/movenc: Add palette to video sample description

Feb 26, 2016

5182

ret = mov_write_single_packet(s, pkt);

avformat/movenc: Fix memleak of reshuffled packet

May 28, 2016

5183

fail:

5184

if (reshuffle_ret)

5185

av_packet_free(&pkt);

lavf/movenc: Add palette to video sample description

Feb 26, 2016

5186

return ret;

5187

}

5188

}

5189

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

5190

return mov_write_single_packet(s, pkt);

movenc: Allow the caller to decide on fragmentation

Jan 20, 2012

5191

}

5192

}

5193

movenc: Write QuickTime chapters

May 5, 2010

5194

// QuickTime chapters involve an additional text track with the chapter names

5195

// as samples, and a tref pointing from the other tracks to the chapter one.

movenc: Make chapter track QuickTime compatible

Aug 19, 2013

5196

static int mov_create_chapter_track(AVFormatContext *s, int tracknum)

movenc: Write QuickTime chapters

May 5, 2010

5197

{

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

5198

AVIOContext *pb;

5199

movenc: Write QuickTime chapters

May 5, 2010

5200

MOVMuxContext *mov = s->priv_data;

5201

MOVTrack *track = &mov->tracks[tracknum];

5202

AVPacket pkt = { .stream_index = tracknum, .flags = AV_PKT_FLAG_KEY };

5203

int i, len;

5204

5205

track->mode = mov->mode;

5206

track->tag = MKTAG('t','e','x','t');

5207

track->timescale = MOV_TIMESCALE;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5208

track->par = avcodec_parameters_alloc();

5209

if (!track->par)

movenc: Check for allocation failures in mov_create_chapter_track

Aug 25, 2013

5210

return AVERROR(ENOMEM);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5211

track->par->codec_type = AVMEDIA_TYPE_SUBTITLE;

Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'

Aug 22, 2013

5212

#if 0

avcodec/movenc: move chapter_properties under the #if of the code tha…

Aug 24, 2013

5213

// These properties are required to make QT recognize the chapter track

5214

uint8_t chapter_properties[43] = { 0, 0, 0, 0, 0, 0, 0, 1, };

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5215

if (ff_alloc_extradata(track->par, sizeof(chapter_properties)))

movenc: Make chapter track QuickTime compatible

Aug 19, 2013

5216

return AVERROR(ENOMEM);

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5217

memcpy(track->par->extradata, chapter_properties, sizeof(chapter_properties));

Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'

Aug 22, 2013

5218

#else

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

5219

if (avio_open_dyn_buf(&pb) >= 0) {

5220

int size;

5221

uint8_t *buf;

5222

5223

/* Stub header (usually for Quicktime chapter track) */

5224

// TextSampleEntry

5225

avio_wb32(pb, 0x01); // displayFlags

5226

avio_w8(pb, 0x00); // horizontal justification

5227

avio_w8(pb, 0x00); // vertical justification

5228

avio_w8(pb, 0x00); // bgColourRed

5229

avio_w8(pb, 0x00); // bgColourGreen

5230

avio_w8(pb, 0x00); // bgColourBlue

5231

avio_w8(pb, 0x00); // bgColourAlpha

5232

// BoxRecord

5233

avio_wb16(pb, 0x00); // defTextBoxTop

5234

avio_wb16(pb, 0x00); // defTextBoxLeft

5235

avio_wb16(pb, 0x00); // defTextBoxBottom

5236

avio_wb16(pb, 0x00); // defTextBoxRight

5237

// StyleRecord

5238

avio_wb16(pb, 0x00); // startChar

5239

avio_wb16(pb, 0x00); // endChar

5240

avio_wb16(pb, 0x01); // fontID

5241

avio_w8(pb, 0x00); // fontStyleFlags

5242

avio_w8(pb, 0x00); // fontSize

5243

avio_w8(pb, 0x00); // fgColourRed

5244

avio_w8(pb, 0x00); // fgColourGreen

5245

avio_w8(pb, 0x00); // fgColourBlue

5246

avio_w8(pb, 0x00); // fgColourAlpha

5247

// FontTableBox

5248

avio_wb32(pb, 0x0D); // box size

5249

ffio_wfourcc(pb, "ftab"); // box atom name

5250

avio_wb16(pb, 0x01); // entry count

5251

// FontRecord

5252

avio_wb16(pb, 0x01); // font ID

5253

avio_w8(pb, 0x00); // font name length

5254

5255

if ((size = avio_close_dyn_buf(pb, &buf)) > 0) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5256

track->par->extradata = buf;

5257

track->par->extradata_size = size;

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

5258

} else {

Replace an incorrect av_free() in movenc.c with av_freep().

Mar 10, 2014

5259

av_freep(&buf);

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

5260

}

5261

}

Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'

Aug 22, 2013

5262

#endif

movenc: Fix muxing of Apple Quicktime chapters. v3

May 20, 2012

5263

movenc: Write QuickTime chapters

May 5, 2010

5264

for (i = 0; i < s->nb_chapters; i++) {

5265

AVChapter *c = s->chapters[i];

Remove all uses of now deprecated metadata functions.

May 22, 2011

5266

AVDictionaryEntry *t;

movenc: Write QuickTime chapters

May 5, 2010

5267

5268

        int64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1,MOV_TIMESCALE});

5269

        pkt.pts = pkt.dts = av_rescale_q(c->start, c->time_base, (AVRational){1,MOV_TIMESCALE});

5270

pkt.duration = end - pkt.dts;

5271

Remove all uses of now deprecated metadata functions.

May 22, 2011

5272

if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {

Mark read-only tables as static

Nov 11, 2015

5273

static const char encd[12] = {

movenc: fix QT chapter track character encoding

Jul 31, 2014

5274

0x00, 0x00, 0x00, 0x0C,

5275

'e', 'n', 'c', 'd',

5276

0x00, 0x00, 0x01, 0x00 };

movenc: K&R formatting cosmetics

Jul 7, 2013

5277

len = strlen(t->value);

movenc: fix QT chapter track character encoding

Jul 31, 2014

5278

pkt.size = len + 2 + 12;

movenc: Write QuickTime chapters

May 5, 2010

5279

pkt.data = av_malloc(pkt.size);

movenc: Check for allocation failures in mov_create_chapter_track

Aug 25, 2013

5280

if (!pkt.data)

5281

return AVERROR(ENOMEM);

movenc: Write QuickTime chapters

May 5, 2010

5282

AV_WB16(pkt.data, len);

movenc: K&R formatting cosmetics

Jul 7, 2013

5283

memcpy(pkt.data + 2, t->value, len);

movenc: fix QT chapter track character encoding

Jul 31, 2014

5284

memcpy(pkt.data + len + 2, encd, sizeof(encd));

Make mov_write_packet non-static, add ff_ prefix

May 18, 2010

5285

ff_mov_write_packet(s, &pkt);

movenc: Write QuickTime chapters

May 5, 2010

5286

av_freep(&pkt.data);

5287

}

5288

}

movenc: Make chapter track QuickTime compatible

Aug 19, 2013

5289

5290

return 0;

movenc: Write QuickTime chapters

May 5, 2010

5291

}

5292

avformat/movenc: Skip unsupported video tracks in timecode generation

Apr 29, 2016

5293

5294

static int mov_check_timecode_track(AVFormatContext *s, AVTimecode *tc, int src_index, const char *tcstr)

5295

{

5296

int ret;

5297

5298

/* compute the frame number */

5299

    ret = av_timecode_init_from_string(tc, find_fps(s,  s->streams[src_index]), tcstr, s);

5300

return ret;

5301

}

5302

5303

static int mov_create_timecode_track(AVFormatContext *s, int index, int src_index, AVTimecode tc)

movenc: add timecode track support.

Mar 5, 2012

5304

{

lavf/movenc: add frame rate heuristic for timecode frame rate.

Aug 3, 2012

5305

int ret;

movenc: add timecode track support.

Mar 5, 2012

5306

MOVMuxContext *mov = s->priv_data;

5307

MOVTrack *track = &mov->tracks[index];

5308

AVStream *src_st = s->streams[src_index];

5309

AVPacket pkt = {.stream_index = index, .flags = AV_PKT_FLAG_KEY, .size = 4};

avformat/movenc: factor out find_fps()

Oct 7, 2013

5310

AVRational rate = find_fps(s, src_st);

lavf/movenc: add frame rate heuristic for timecode frame rate.

Aug 3, 2012

5311

movenc: add timecode track support.

Mar 5, 2012

5312

/* tmcd track based on video stream */

5313

track->mode = mov->mode;

5314

track->tag = MKTAG('t','m','c','d');

5315

track->src_track = src_index;

movenc: fix timescale for timecode track

Oct 12, 2012

5316

track->timescale = mov->tracks[src_index].timescale;

movenc: add timecode track support.

Mar 5, 2012

5317

if (tc.flags & AV_TIMECODE_FLAG_DROPFRAME)

5318

track->timecode_flags |= MOV_TIMECODE_FLAG_DROPFRAME;

5319

avformat/movenc: write reel_name metadata to tmcd atom

Aug 8, 2014

5320

/* set st to src_st for metadata access*/

5321

track->st = src_st;

5322

movenc: add timecode track support.

Mar 5, 2012

5323

/* encode context: tmcd data stream */

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5324

track->par = avcodec_parameters_alloc();

5325

if (!track->par)

avformat/movenc: Check for memory allocation failures

Feb 22, 2015

5326

return AVERROR(ENOMEM);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5327

track->par->codec_type = AVMEDIA_TYPE_DATA;

5328

track->par->codec_tag = track->tag;

5329

track->st->avg_frame_rate = av_inv_q(rate);

movenc: add timecode track support.

Mar 5, 2012

5330

5331

/* the tmcd track just contains one packet with the frame number */

5332

pkt.data = av_malloc(pkt.size);

avformat/movenc: Check for memory allocation failures

Feb 22, 2015

5333

if (!pkt.data)

5334

return AVERROR(ENOMEM);

movenc: add timecode track support.

Mar 5, 2012

5335

AV_WB32(pkt.data, tc.start);

5336

ret = ff_mov_write_packet(s, &pkt);

5337

av_free(pkt.data);

5338

return ret;

5339

}

5340

movenc: Make tkhd "enabled" flag QuickTime compatible

Aug 22, 2013

5341

/*

5342

* st->disposition controls the "enabled" flag in the tkhd tag.

5343

* QuickTime will not play a track if it is not enabled. So make sure

5344

* that one track of each type (audio, video, subtitle) is enabled.

5345

*

5346

* Subtitles are special. For audio and video, setting "enabled" also

5347

* makes the track "default" (i.e. it is rendered when played). For

5348

* subtitles, an "enabled" subtitle is not rendered by default, but

5349

* if no subtitle is enabled, the subtitle menu in QuickTime will be

5350

* empty!

5351

*/

5352

static void enable_tracks(AVFormatContext *s)

5353

{

5354

MOVMuxContext *mov = s->priv_data;

5355

int i;

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

5356

int enabled[AVMEDIA_TYPE_NB];

movenc: Make tkhd "enabled" flag QuickTime compatible

Aug 22, 2013

5357

int first[AVMEDIA_TYPE_NB];

5358

5359

for (i = 0; i < AVMEDIA_TYPE_NB; i++) {

5360

enabled[i] = 0;

5361

first[i] = -1;

5362

}

5363

5364

for (i = 0; i < s->nb_streams; i++) {

5365

AVStream *st = s->streams[i];

5366

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5367

if (st->codecpar->codec_type <= AVMEDIA_TYPE_UNKNOWN ||

5368

st->codecpar->codec_type >= AVMEDIA_TYPE_NB)

movenc: Make tkhd "enabled" flag QuickTime compatible

Aug 22, 2013

5369

continue;

5370

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5371

if (first[st->codecpar->codec_type] < 0)

5372

first[st->codecpar->codec_type] = i;

movenc: Make tkhd "enabled" flag QuickTime compatible

Aug 22, 2013

5373

if (st->disposition & AV_DISPOSITION_DEFAULT) {

5374

mov->tracks[i].flags |= MOV_TRACK_ENABLED;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5375

enabled[st->codecpar->codec_type]++;

movenc: Make tkhd "enabled" flag QuickTime compatible

Aug 22, 2013

5376

}

5377

}

5378

5379

for (i = 0; i < AVMEDIA_TYPE_NB; i++) {

5380

switch (i) {

5381

case AVMEDIA_TYPE_VIDEO:

5382

case AVMEDIA_TYPE_AUDIO:

5383

case AVMEDIA_TYPE_SUBTITLE:

mov: Do not group tracks if more than one is enabled per type

Jul 4, 2014

5384

if (enabled[i] > 1)

5385

mov->per_stream_grouping = 1;

movenc: Make tkhd "enabled" flag QuickTime compatible

Aug 22, 2013

5386

if (!enabled[i] && first[i] >= 0)

5387

mov->tracks[first[i]].flags |= MOV_TRACK_ENABLED;

5388

break;

5389

}

5390

}

5391

}

5392

movenc: Properly free allocated data on failures in mov_write_header

Aug 26, 2013

5393

static void mov_free(AVFormatContext *s)

5394

{

5395

MOVMuxContext *mov = s->priv_data;

5396

int i;

5397

5398

if (mov->chapter_track) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5399

if (mov->tracks[mov->chapter_track].par)

5400

av_freep(&mov->tracks[mov->chapter_track].par->extradata);

5401

av_freep(&mov->tracks[mov->chapter_track].par);

movenc: Properly free allocated data on failures in mov_write_header

Aug 26, 2013

5402

}

5403

5404

for (i = 0; i < mov->nb_streams; i++) {

5405

if (mov->tracks[i].tag == MKTAG('r','t','p',' '))

5406

ff_mov_close_hinting(&mov->tracks[i]);

Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'

Aug 27, 2013

5407

else if (mov->tracks[i].tag == MKTAG('t','m','c','d') && mov->nb_meta_tmcd)

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5408

av_freep(&mov->tracks[i].par);

movenc: Properly free allocated data on failures in mov_write_header

Aug 26, 2013

5409

av_freep(&mov->tracks[i].cluster);

5410

av_freep(&mov->tracks[i].frag_info);

5411

5412

if (mov->tracks[i].vos_len)

Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'

Aug 27, 2013

5413

av_freep(&mov->tracks[i].vos_data);

movenc: support cenc (common encryption)

Dec 7, 2015

5414

5415

ff_mov_cenc_free(&mov->tracks[i].cenc);

movenc: Properly free allocated data on failures in mov_write_header

Aug 26, 2013

5416

}

5417

5418

av_freep(&mov->tracks);

5419

}

5420

movenc: Add dvd subtitle support

Mar 18, 2014

5421

static uint32_t rgb_to_yuv(uint32_t rgb)

5422

{

5423

uint8_t r, g, b;

5424

int y, cb, cr;

5425

5426

r = (rgb >> 16) & 0xFF;

5427

g = (rgb >> 8) & 0xFF;

5428

b = (rgb ) & 0xFF;

5429

avformat/movenc: Remove float use from rgb_to_yuv()

May 24, 2015

5430

y = av_clip_uint8(( 16000 + 257 * r + 504 * g + 98 * b)/1000);

5431

cb = av_clip_uint8((128000 - 148 * r - 291 * g + 439 * b)/1000);

5432

cr = av_clip_uint8((128000 + 439 * r - 368 * g - 71 * b)/1000);

movenc: Add dvd subtitle support

Mar 18, 2014

5433

5434

return (y << 16) | (cr << 8) | cb;

5435

}

5436

5437

static int mov_create_dvd_sub_decoder_specific_info(MOVTrack *track,

5438

AVStream *st)

5439

{

5440

int i, width = 720, height = 480;

5441

int have_palette = 0, have_size = 0;

5442

uint32_t palette[16];

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5443

char *cur = st->codecpar->extradata;

movenc: Add dvd subtitle support

Mar 18, 2014

5444

5445

while (cur && *cur) {

5446

if (strncmp("palette:", cur, 8) == 0) {

5447

int i, count;

5448

count = sscanf(cur + 8,

More correct printf format specifiers

Apr 1, 2014

5449

"%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32", "

5450

"%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32", "

5451

"%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32", "

5452

"%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32"",

movenc: Add dvd subtitle support

Mar 18, 2014

5453

&palette[ 0], &palette[ 1], &palette[ 2], &palette[ 3],

5454

&palette[ 4], &palette[ 5], &palette[ 6], &palette[ 7],

5455

&palette[ 8], &palette[ 9], &palette[10], &palette[11],

5456

&palette[12], &palette[13], &palette[14], &palette[15]);

5457

5458

for (i = 0; i < count; i++) {

5459

palette[i] = rgb_to_yuv(palette[i]);

5460

}

5461

have_palette = 1;

5462

} else if (!strncmp("size:", cur, 5)) {

5463

sscanf(cur + 5, "%dx%d", &width, &height);

5464

have_size = 1;

5465

}

5466

if (have_palette && have_size)

5467

break;

5468

cur += strcspn(cur, "\n\r");

5469

cur += strspn(cur, "\n\r");

5470

}

5471

if (have_palette) {

5472

track->vos_data = av_malloc(16*4);

5473

if (!track->vos_data)

5474

return AVERROR(ENOMEM);

5475

for (i = 0; i < 16; i++) {

5476

AV_WB32(track->vos_data + i * 4, palette[i]);

5477

}

5478

track->vos_len = 16 * 4;

5479

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5480

st->codecpar->width = width;

5481

st->codecpar->height = track->height = height;

movenc: Add dvd subtitle support

Mar 18, 2014

5482

5483

return 0;

5484

}

5485

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

5486

static int mov_init(AVFormatContext *s)

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5487

{

5488

MOVMuxContext *mov = s->priv_data;

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

5489

AVDictionaryEntry *global_tcr = av_dict_get(s->metadata, "timecode", NULL, 0);

lavf/movenc: return meaningful error code from mov_write_header()

Dec 11, 2013

5490

int i, ret, hint_track = 0, tmcd_track = 0;

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5491

movenc: add track title to tracks

Jul 31, 2014

5492

mov->fc = s;

5493

movenc: Set mov->mode earlier in mov_write_header

Sep 21, 2013

5494

/* Default mode == MP4 */

5495

mov->mode = MODE_MP4;

5496

cosmetics: Write NULL pointer inequality checks more compactly

Aug 14, 2014

5497

if (s->oformat) {

movenc: Set mov->mode earlier in mov_write_header

Sep 21, 2013

5498

if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;

5499

else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2;

5500

else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;

5501

else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP;

5502

else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD;

5503

else if (!strcmp("ismv",s->oformat->name)) mov->mode = MODE_ISM;

Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'

Sep 23, 2013

5504

else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V;

movenc: Set mov->mode earlier in mov_write_header

Sep 21, 2013

5505

}

5506

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

5507

if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)

5508

mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;

5509

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

5510

/* Set the FRAGMENT flag if any of the fragmentation methods are

5511

* enabled. */

5512

if (mov->max_fragment_duration || mov->max_fragment_size ||

5513

mov->flags & (FF_MOV_FLAG_EMPTY_MOOV |

5514

FF_MOV_FLAG_FRAG_KEYFRAME |

5515

FF_MOV_FLAG_FRAG_CUSTOM))

5516

mov->flags |= FF_MOV_FLAG_FRAGMENT;

5517

movenc: Set all implicit flags immediately in mov_write_header

Sep 10, 2013

5518

/* Set other implicit flags immediately */

5519

if (mov->mode == MODE_ISM)

5520

mov->flags |= FF_MOV_FLAG_EMPTY_MOOV | FF_MOV_FLAG_SEPARATE_MOOF |

5521

FF_MOV_FLAG_FRAGMENT;

movenc: Add support for writing sidx atoms for DASH segments

Oct 5, 2014

5522

if (mov->flags & FF_MOV_FLAG_DASH)

5523

mov->flags |= FF_MOV_FLAG_FRAGMENT | FF_MOV_FLAG_EMPTY_MOOV |

5524

FF_MOV_FLAG_DEFAULT_BASE_MOOF;

movenc: Set all implicit flags immediately in mov_write_header

Sep 10, 2013

5525

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

5526

if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV && s->flags & AVFMT_FLAG_AUTO_BSF) {

5527

        av_log(s, AV_LOG_VERBOSE, "Empty MOOV enabled; disabling automatic bitstream filtering\n");

5528

s->flags &= ~AVFMT_FLAG_AUTO_BSF;

5529

}

5530

lavf/movenc: add faststart option.

Sep 20, 2012

5531

if (mov->flags & FF_MOV_FLAG_FASTSTART) {

Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'

Nov 17, 2014

5532

mov->reserved_moov_size = -1;

lavf/movenc: add faststart option.

Sep 20, 2012

5533

}

5534

movenc: Allow to request not to use edit lists

Nov 4, 2014

5535

if (mov->use_editlist < 0) {

5536

mov->use_editlist = 1;

movenc: Enable editlists by default if delay_moov is enabled

Jan 2, 2015

5537

if (mov->flags & FF_MOV_FLAG_FRAGMENT &&

5538

!(mov->flags & FF_MOV_FLAG_DELAY_MOOV)) {

movenc: Allow to request not to use edit lists

Nov 4, 2014

5539

// If we can avoid needing an edit list by shifting the

5540

// tracks, prefer that over (trying to) write edit lists

5541

// in fragmented output.

5542

if (s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO ||

5543

s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_MAKE_ZERO)

5544

mov->use_editlist = 0;

5545

}

movenc: support an alternative to edit lists to handle the first DTS …

Sep 29, 2012

5546

}

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

5547

if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV &&

5548

!(mov->flags & FF_MOV_FLAG_DELAY_MOOV) && mov->use_editlist)

5549

        av_log(s, AV_LOG_WARNING, "No meaningful edit list will be written when using empty_moov without delay_moov\n");

movenc: Allow to request not to use edit lists

Nov 4, 2014

5550

5551

if (!mov->use_editlist && s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO)

5552

s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_ZERO;

movenc: support an alternative to edit lists to handle the first DTS …

Sep 29, 2012

5553

movenc: Allow interleaving samples when writing fragmented files

Sep 10, 2013

5554

/* Clear the omit_tfhd_offset flag if default_base_moof is set;

5555

* if the latter is set that's enough and omit_tfhd_offset doesn't

5556

* add anything extra on top of that. */

5557

if (mov->flags & FF_MOV_FLAG_OMIT_TFHD_OFFSET &&

5558

mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF)

5559

mov->flags &= ~FF_MOV_FLAG_OMIT_TFHD_OFFSET;

5560

5561

if (mov->frag_interleave &&

5562

mov->flags & (FF_MOV_FLAG_OMIT_TFHD_OFFSET | FF_MOV_FLAG_SEPARATE_MOOF)) {

5563

av_log(s, AV_LOG_ERROR,

5564

"Sample interleaving in fragments is mutually exclusive with "

5565

"omit_tfhd_offset and separate_moof\n");

5566

return AVERROR(EINVAL);

5567

}

5568

movenc: Buffer the mdat for the initial moov fragment, too

Feb 2, 2012

5569

/* Non-seekable output is ok if using fragmentation. If ism_lookahead

movenc: Allow writing to a non-seekable output if using empty moov

Jan 19, 2012

5570

* is enabled, we don't support non-seekable output at all. */

5571

if (!s->pb->seekable &&

movenc: Simplify setting the fragmentation flag

Sep 9, 2013

5572

(!(mov->flags & FF_MOV_FLAG_FRAGMENT) || mov->ism_lookahead)) {

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5573

av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");

movenc: Return a proper error code for invalid combinations

Sep 22, 2013

5574

return AVERROR(EINVAL);

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5575

}

5576

movenc: Write QuickTime chapters

May 5, 2010

5577

mov->nb_streams = s->nb_streams;

movenc: Allow chapter track in default MODE_MP4

Aug 19, 2013

5578

if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters)

movenc: Write QuickTime chapters

May 5, 2010

5579

mov->chapter_track = mov->nb_streams++;

5580

movenc: Deprecate the global RTP hinting flag, use a private AVOption…

May 20, 2011

5581

if (mov->flags & FF_MOV_FLAG_RTP_HINT) {

Add initial support for RTP hinting in the mov muxer

May 18, 2010

5582

/* Add hint tracks for each audio and video stream */

5583

hint_track = mov->nb_streams;

5584

for (i = 0; i < s->nb_streams; i++) {

5585

AVStream *st = s->streams[i];

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5586

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ||

5587

st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {

Add initial support for RTP hinting in the mov muxer

May 18, 2010

5588

mov->nb_streams++;

5589

}

5590

}

5591

}

5592

lavf/movenc: Allow to disable writing the timecode track.

Sep 26, 2016

5593

    if (   mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode == MODE_MP4)

5594

|| mov->write_tmcd == 1) {

movenc: add timecode track support.

Mar 5, 2012

5595

tmcd_track = mov->nb_streams;

lavf/movenc: fix invalid free with timecode meta and tmcd data copy.

Aug 3, 2012

5596

5597

/* +1 tmcd track for each video stream with a timecode */

movenc: add timecode track support.

Mar 5, 2012

5598

for (i = 0; i < s->nb_streams; i++) {

5599

AVStream *st = s->streams[i];

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

5600

AVDictionaryEntry *t = global_tcr;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5601

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&

avformat/movenc: Skip unsupported video tracks in timecode generation

Apr 29, 2016

5602

(t || (t=av_dict_get(st->metadata, "timecode", NULL, 0)))) {

5603

AVTimecode tc;

5604

ret = mov_check_timecode_track(s, &tc, i, t->value);

5605

if (ret >= 0)

5606

mov->nb_meta_tmcd++;

5607

}

lavf/movenc: fix invalid free with timecode meta and tmcd data copy.

Aug 3, 2012

5608

}

5609

5610

/* check if there is already a tmcd track to remux */

5611

if (mov->nb_meta_tmcd) {

5612

for (i = 0; i < s->nb_streams; i++) {

5613

AVStream *st = s->streams[i];

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5614

if (st->codecpar->codec_tag == MKTAG('t','m','c','d')) {

lavf/movenc: fix invalid free with timecode meta and tmcd data copy.

Aug 3, 2012

5615

                    av_log(s, AV_LOG_WARNING, "You requested a copy of the original timecode track "

5616

"so timecode metadata are now ignored\n");

5617

mov->nb_meta_tmcd = 0;

5618

}

5619

}

movenc: add timecode track support.

Mar 5, 2012

5620

}

lavf/movenc: fix invalid free with timecode meta and tmcd data copy.

Aug 3, 2012

5621

5622

mov->nb_streams += mov->nb_meta_tmcd;

movenc: add timecode track support.

Mar 5, 2012

5623

}

5624

movenc: Allow chapters to be written in trailer

Aug 19, 2013

5625

// Reserve an extra stream for chapters for the case where chapters

5626

// are written in the trailer

avformat/movenc: use av_malloc(z)_array()

Jun 8, 2014

5627

mov->tracks = av_mallocz_array((mov->nb_streams + 1), sizeof(*mov->tracks));

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5628

if (!mov->tracks)

5629

return AVERROR(ENOMEM);

5630

movenc: support cenc (common encryption)

Dec 7, 2015

5631

    if (mov->encryption_scheme_str != NULL && strcmp(mov->encryption_scheme_str, "none") != 0) {

5632

if (strcmp(mov->encryption_scheme_str, "cenc-aes-ctr") == 0) {

5633

mov->encryption_scheme = MOV_ENC_CENC_AES_CTR;

5634

5635

if (mov->encryption_key_len != AES_CTR_KEY_SIZE) {

5636

av_log(s, AV_LOG_ERROR, "Invalid encryption key len %d expected %d\n",

5637

mov->encryption_key_len, AES_CTR_KEY_SIZE);

lavf/movenc: add deinit function

Apr 8, 2016

5638

return AVERROR(EINVAL);

movenc: support cenc (common encryption)

Dec 7, 2015

5639

}

5640

5641

if (mov->encryption_kid_len != CENC_KID_SIZE) {

5642

av_log(s, AV_LOG_ERROR, "Invalid encryption kid len %d expected %d\n",

5643

mov->encryption_kid_len, CENC_KID_SIZE);

lavf/movenc: add deinit function

Apr 8, 2016

5644

return AVERROR(EINVAL);

movenc: support cenc (common encryption)

Dec 7, 2015

5645

}

5646

} else {

5647

av_log(s, AV_LOG_ERROR, "unsupported encryption scheme %s\n",

5648

mov->encryption_scheme_str);

lavf/movenc: add deinit function

Apr 8, 2016

5649

return AVERROR(EINVAL);

movenc: support cenc (common encryption)

Dec 7, 2015

5650

}

5651

}

5652

movenc: K&R formatting cosmetics

Jul 7, 2013

5653

for (i = 0; i < s->nb_streams; i++) {

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5654

AVStream *st= s->streams[i];

5655

MOVTrack *track= &mov->tracks[i];

Remove all uses of now deprecated metadata functions.

May 22, 2011

5656

AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0);

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5657

movenc: use the "encoder" metadata tag to write stsd Compressorname

Apr 29, 2014

5658

track->st = st;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5659

track->par = st->codecpar;

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5660

        track->language = ff_mov_iso639_to_lang(lang?lang->value:"und", mov->mode!=MODE_MOV);

5661

if (track->language < 0)

5662

track->language = 0;

5663

track->mode = mov->mode;

movenc: K&R formatting cosmetics

Jul 7, 2013

5664

track->tag = mov_find_codec_tag(s, track);

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5665

if (!track->tag) {

lavf/movenc: improve feedback in case of unsupported codec

Dec 11, 2013

5666

av_log(s, AV_LOG_ERROR, "Could not find tag for codec %s in stream #%d, "

5667

"codec not currently supported in container\n",

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5668

avcodec_get_name(st->codecpar->codec_id), i);

lavf/movenc: add deinit function

Apr 8, 2016

5669

return AVERROR(EINVAL);

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5670

}

Add initial support for RTP hinting in the mov muxer

May 18, 2010

5671

/* If hinting of this track is enabled by a later hint track,

5672

* this is updated. */

5673

track->hint_track = -1;

movenc: K&R formatting cosmetics

Jul 7, 2013

5674

track->start_dts = AV_NOPTS_VALUE;

movenc: Adjust the pts of new fragments similarly to what is done for…

Nov 23, 2014

5675

track->start_cts = AV_NOPTS_VALUE;

movenc: Don't assume that fragment durations in pts is equal to durat…

Mar 15, 2015

5676

track->end_pts = AV_NOPTS_VALUE;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5677

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5678

            if (track->tag == MKTAG('m','x','3','p') || track->tag == MKTAG('m','x','3','n') ||

5679

track->tag == MKTAG('m','x','4','p') || track->tag == MKTAG('m','x','4','n') ||

5680

track->tag == MKTAG('m','x','5','p') || track->tag == MKTAG('m','x','5','n')) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5681

                if (st->codecpar->width != 720 || (st->codecpar->height != 608 && st->codecpar->height != 512)) {

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5682

                    av_log(s, AV_LOG_ERROR, "D-10/IMX must use 720x608 or 720x512 video resolution\n");

lavf/movenc: add deinit function

Apr 8, 2016

5683

return AVERROR(EINVAL);

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5684

}

movenc: K&R formatting cosmetics

Jul 7, 2013

5685

track->height = track->tag >> 24 == 'n' ? 486 : 576;

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5686

}

movenc: add video_track_timescale option

May 16, 2013

5687

if (mov->video_track_timescale) {

5688

track->timescale = mov->video_track_timescale;

5689

} else {

Merge commit '194be1f43ea391eb986732707435176e579265aa'

Jun 18, 2014

5690

track->timescale = st->time_base.den;

movenc: add video_track_timescale option

May 16, 2013

5691

while(track->timescale < 10000)

5692

track->timescale *= 2;

5693

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5694

if (st->codecpar->width > 65535 || st->codecpar->height > 65535) {

5695

                av_log(s, AV_LOG_ERROR, "Resolution %dx%d too large for mov/mp4\n", st->codecpar->width, st->codecpar->height);

lavf/movenc: add deinit function

Apr 8, 2016

5696

return AVERROR(EINVAL);

avformat/movenc: check that the video resolution is supported

Jul 8, 2014

5697

}

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5698

if (track->mode == MODE_MOV && track->timescale > 100000)

5699

av_log(s, AV_LOG_WARNING,

5700

"WARNING codec timebase is very high. If duration is too long,\n"

5701

"file may not be playable by quicktime. Specify a shorter timebase\n"

5702

"or choose different container.\n");

lavf/movenc: Add palette to video sample description

Feb 26, 2016

5703

if (track->mode == MODE_MOV &&

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5704

track->par->codec_id == AV_CODEC_ID_RAWVIDEO &&

lavf/movenc: Add palette to video sample description

Feb 26, 2016

5705

track->tag == MKTAG('r','a','w',' ')) {

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5706

enum AVPixelFormat pix_fmt = track->par->format;

5707

if (pix_fmt == AV_PIX_FMT_NONE && track->par->bits_per_coded_sample == 1)

lavf/movenc: Add palette to video sample description

Feb 26, 2016

5708

pix_fmt = AV_PIX_FMT_MONOWHITE;

5709

track->is_unaligned_qt_rgb =

5710

pix_fmt == AV_PIX_FMT_RGB24 ||

5711

pix_fmt == AV_PIX_FMT_BGR24 ||

5712

pix_fmt == AV_PIX_FMT_PAL8 ||

5713

pix_fmt == AV_PIX_FMT_GRAY8 ||

5714

pix_fmt == AV_PIX_FMT_MONOWHITE ||

5715

pix_fmt == AV_PIX_FMT_MONOBLACK;

5716

}

Add experimental support for vp9 in iso-bmff

Jun 15, 2016

5717

if (track->mode == MODE_MP4 &&

5718

track->par->codec_id == AV_CODEC_ID_VP9) {

5719

if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {

5720

av_log(s, AV_LOG_ERROR,

5721

"VP9 in MP4 support is experimental, add "

5722

"'-strict %d' if you want to use it.\n",

5723

FF_COMPLIANCE_EXPERIMENTAL);

lavf/movenc: add deinit function

Apr 8, 2016

5724

return AVERROR_EXPERIMENTAL;

Add experimental support for vp9 in iso-bmff

Jun 15, 2016

5725

}

5726

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5727

} else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {

5728

track->timescale = st->codecpar->sample_rate;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5729

            if (!st->codecpar->frame_size && !av_get_bits_per_sample(st->codecpar->codec_id)) {

movenc: store codecs that dont provide a frame_size as audio_vbr=1

May 7, 2012

5730

av_log(s, AV_LOG_WARNING, "track %d: codec frame size is not set\n", i);

5731

track->audio_vbr = 1;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5732

}else if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_MS ||

5733

st->codecpar->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV ||

5734

st->codecpar->codec_id == AV_CODEC_ID_ILBC){

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5735

if (!st->codecpar->block_align) {

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

5736

                    av_log(s, AV_LOG_ERROR, "track %d: codec block align is not set for adpcm\n", i);

lavf/movenc: add deinit function

Apr 8, 2016

5737

return AVERROR(EINVAL);

In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime suppor…

Jan 20, 2011

5738

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5739

track->sample_size = st->codecpar->block_align;

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5740

}else if (st->codecpar->frame_size > 1){ /* assume compressed audio */

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5741

track->audio_vbr = 1;

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compress…

Jan 22, 2012

5742

}else{

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5743

                track->sample_size = (av_get_bits_per_sample(st->codecpar->codec_id) >> 3) * st->codecpar->channels;

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5744

}

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5745

if (st->codecpar->codec_id == AV_CODEC_ID_ILBC ||

5746

st->codecpar->codec_id == AV_CODEC_ID_ADPCM_IMA_QT) {

movenc: ilbc needs audio_vbr set.

Aug 20, 2013

5747

track->audio_vbr = 1;

5748

}

movenc: Support high sample rates in isomedia formats by setting the …

Apr 20, 2012

5749

if (track->mode != MODE_MOV &&

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5750

track->par->codec_id == AV_CODEC_ID_MP3 && track->timescale < 16000) {

avformat/movenc: Use strict_std_compliance from the muxer layer inste…

May 26, 2015

5751

if (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL) {

avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user…

May 26, 2015

5752

                    av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not standard, to mux anyway set strict to -1\n",

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5753

i, track->par->sample_rate);

lavf/movenc: add deinit function

Apr 8, 2016

5754

return AVERROR(EINVAL);

avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user…

May 26, 2015

5755

} else {

5756

                    av_log(s, AV_LOG_WARNING, "track %d: muxing mp3 at %dhz is not standard in MP4\n",

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5757

i, track->par->sample_rate);

avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user…

May 26, 2015

5758

}

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5759

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5760

} else if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) {

lavf: switch to AVStream.time_base as the hint for the muxer timebase

May 18, 2014

5761

track->timescale = st->time_base.den;

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5762

} else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) {

lavf: switch to AVStream.time_base as the hint for the muxer timebase

May 18, 2014

5763

track->timescale = st->time_base.den;

Merge commit '39523030108815242178ac5e209c83070bd1baef'

Aug 20, 2013

5764

} else {

movenc: add some default cases.

Mar 24, 2012

5765

track->timescale = MOV_TIMESCALE;

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5766

}

5767

if (!track->height)

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5768

track->height = st->codecpar->height;

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

5769

/* The ism specific timescale isn't mandatory, but is assumed by

5770

* some tools, such as mp4split. */

5771

if (mov->mode == MODE_ISM)

5772

track->timescale = 10000000;

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5773

lavf: make av_set_pts_info private.

Nov 29, 2011

5774

avpriv_set_pts_info(st, 64, 1, track->timescale);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

5775

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

5776

if (mov->encryption_scheme == MOV_ENC_CENC_AES_CTR) {

5777

ret = ff_mov_cenc_init(&track->cenc, mov->encryption_key,

5778

track->par->codec_id == AV_CODEC_ID_H264, s->flags & AVFMT_FLAG_BITEXACT);

5779

if (ret)

5780

return ret;

5781

}

5782

}

5783

5784

enable_tracks(s);

5785

return 0;

5786

}

5787

5788

static int mov_write_header(AVFormatContext *s)

5789

{

5790

AVIOContext *pb = s->pb;

5791

MOVMuxContext *mov = s->priv_data;

5792

    AVDictionaryEntry *t, *global_tcr = av_dict_get(s->metadata, "timecode", NULL, 0);

5793

int i, ret, hint_track = 0, tmcd_track = 0, nb_tracks = s->nb_streams;

5794

5795

if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters)

5796

nb_tracks++;

5797

5798

if (mov->flags & FF_MOV_FLAG_RTP_HINT) {

5799

/* Add hint tracks for each audio and video stream */

5800

hint_track = nb_tracks;

5801

for (i = 0; i < s->nb_streams; i++) {

5802

AVStream *st = s->streams[i];

5803

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ||

5804

st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {

5805

nb_tracks++;

5806

}

5807

}

5808

}

5809

5810

if (mov->mode == MODE_MOV || mov->mode == MODE_MP4)

5811

tmcd_track = nb_tracks;

5812

5813

for (i = 0; i < s->nb_streams; i++) {

5814

int j;

5815

AVStream *st= s->streams[i];

5816

MOVTrack *track= &mov->tracks[i];

5817

movenc: Add support for writing fragmented mov files

Jan 5, 2012

5818

/* copy extradata if it exists */

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5819

if (st->codecpar->extradata_size) {

5820

if (st->codecpar->codec_id == AV_CODEC_ID_DVD_SUBTITLE)

movenc: Add dvd subtitle support

Mar 18, 2014

5821

mov_create_dvd_sub_decoder_specific_info(track, st);

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5822

            else if (!TAG_IS_AVCI(track->tag) && st->codecpar->codec_id != AV_CODEC_ID_DNXHD) {

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5823

track->vos_len = st->codecpar->extradata_size;

movenc: Add dvd subtitle support

Mar 18, 2014

5824

track->vos_data = av_malloc(track->vos_len);

avformat/movenc: Fix use of uninitialized variable (ret)

Feb 18, 2015

5825

if (!track->vos_data) {

lavf/movenc: add deinit function

Apr 8, 2016

5826

return AVERROR(ENOMEM);

avformat/movenc: Fix use of uninitialized variable (ret)

Feb 18, 2015

5827

}

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5828

memcpy(track->vos_data, st->codecpar->extradata, track->vos_len);

movenc: Add dvd subtitle support

Mar 18, 2014

5829

}

movenc: Add support for writing fragmented mov files

Jan 5, 2012

5830

}

movenc: support cenc (common encryption)

Dec 7, 2015

5831

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5832

if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO ||

5833

track->par->channel_layout != AV_CH_LAYOUT_MONO)

avformat/movenc: dont mark multichannel as mono tracks as containing …

Jul 14, 2014

5834

continue;

5835

5836

for (j = 0; j < s->nb_streams; j++) {

5837

AVStream *stj= s->streams[j];

5838

MOVTrack *trackj= &mov->tracks[j];

5839

if (j == i)

5840

continue;

5841

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5842

if (stj->codecpar->codec_type != AVMEDIA_TYPE_AUDIO ||

5843

trackj->par->channel_layout != AV_CH_LAYOUT_MONO ||

avformat/movenc: dont mark multichannel as mono tracks as containing …

Jul 14, 2014

5844

trackj->language != track->language ||

5845

trackj->tag != track->tag

5846

)

5847

continue;

5848

track->multichannel_as_mono++;

5849

}

5850

}

5851

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

5852

if (!(mov->flags & FF_MOV_FLAG_DELAY_MOOV)) {

5853

if ((ret = mov_write_identification(pb, s)) < 0)

5854

return ret;

5855

}

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5856

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

5857

if (mov->reserved_moov_size){

Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'

Aug 10, 2015

5858

mov->reserved_header_pos = avio_tell(pb);

lavf/movenc: add faststart option.

Sep 20, 2012

5859

if (mov->reserved_moov_size > 0)

5860

avio_skip(pb, mov->reserved_moov_size);

movenc: reserved_moov_size, which allows placing moov at the begin of…

Oct 26, 2011

5861

}

5862

avformat/movenc: simplify code, decrease difference to libav

Feb 19, 2014

5863

if (mov->flags & FF_MOV_FLAG_FRAGMENT) {

5864

/* If no fragmentation options have been set, set a default. */

5865

if (!(mov->flags & (FF_MOV_FLAG_FRAG_KEYFRAME |

5866

FF_MOV_FLAG_FRAG_CUSTOM)) &&

5867

!mov->max_fragment_duration && !mov->max_fragment_size)

5868

mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME;

5869

} else {

movenc: add faststart option for web streaming

Aug 19, 2013

5870

if (mov->flags & FF_MOV_FLAG_FASTSTART)

movenc: Rename reserved_moov_pos to reserved_header_pos

Aug 9, 2015

5871

mov->reserved_header_pos = avio_tell(pb);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

5872

mov_write_mdat_tag(pb, mov);

movenc: add faststart option for web streaming

Aug 19, 2013

5873

}

lavf: deprecate AVFormatContext.timestamp

Jul 7, 2011

5874

avformat/movenc: use ff_parse_creation_time_metadata

Feb 6, 2016

5875

ff_parse_creation_time_metadata(s, &mov->time, 1);

movenc: Don't store a nonzero creation time if nothing was set by the…

Jan 9, 2012

5876

if (mov->time)

5877

mov->time += 0x7C25B080; // 1970 based -> 1904 based

movenc: Write QuickTime chapters

May 5, 2010

5878

5879

if (mov->chapter_track)

lavf/movenc: return meaningful error code from mov_write_header()

Dec 11, 2013

5880

if ((ret = mov_create_chapter_track(s, mov->chapter_track)) < 0)

lavf/movenc: add deinit function

Apr 8, 2016

5881

return ret;

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5882

movenc: Deprecate the global RTP hinting flag, use a private AVOption…

May 20, 2011

5883

if (mov->flags & FF_MOV_FLAG_RTP_HINT) {

Add initial support for RTP hinting in the mov muxer

May 18, 2010

5884

/* Initialize the hint tracks for each audio and video stream */

5885

for (i = 0; i < s->nb_streams; i++) {

5886

AVStream *st = s->streams[i];

lavf: replace AVStream.codec with AVStream.codecpar

Jun 18, 2014

5887

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ||

5888

st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {

lavf/movenc: return meaningful error code from mov_write_header()

Dec 11, 2013

5889

if ((ret = ff_mov_init_hinting(s, hint_track, i)) < 0)

lavf/movenc: add deinit function

Apr 8, 2016

5890

return ret;

Add initial support for RTP hinting in the mov muxer

May 18, 2010

5891

hint_track++;

5892

}

5893

}

5894

}

5895

lavf/movenc: fix invalid free with timecode meta and tmcd data copy.

Aug 3, 2012

5896

if (mov->nb_meta_tmcd) {

movenc: add timecode track support.

Mar 5, 2012

5897

/* Initialize the tmcd tracks */

5898

for (i = 0; i < s->nb_streams; i++) {

5899

AVStream *st = s->streams[i];

5900

t = global_tcr;

5901

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

5902

if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {

avformat/movenc: Skip unsupported video tracks in timecode generation

Apr 29, 2016

5903

AVTimecode tc;

movenc: add timecode track support.

Mar 5, 2012

5904

if (!t)

5905

t = av_dict_get(st->metadata, "timecode", NULL, 0);

5906

if (!t)

5907

continue;

avformat/movenc: Skip unsupported video tracks in timecode generation

Apr 29, 2016

5908

if (mov_check_timecode_track(s, &tc, i, t->value) < 0)

5909

continue;

5910

if ((ret = mov_create_timecode_track(s, tmcd_track, i, tc)) < 0)

lavf/movenc: add deinit function

Apr 8, 2016

5911

return ret;

movenc: add timecode track support.

Mar 5, 2012

5912

tmcd_track++;

5913

}

5914

}

5915

}

5916

avio: rename put_flush_packet -> avio_flush

Mar 14, 2011

5917

avio_flush(pb);

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5918

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

5919

if (mov->flags & FF_MOV_FLAG_ISML)

avformat/movenc: added ability to use original stream ids as track id…

Aug 31, 2016

5920

mov_write_isml_manifest(pb, mov, s);

movenc: Support adding isml (smooth streaming live) metadata

Jan 20, 2012

5921

movenc: Add an option for delaying writing the moov with empty_moov

Nov 3, 2014

5922

if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV &&

5923

!(mov->flags & FF_MOV_FLAG_DELAY_MOOV)) {

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

5924

if ((ret = mov_write_moov_tag(pb, mov, s)) < 0)

5925

return ret;

movenc: Automatically flush after writing the initial moov

Nov 6, 2015

5926

avio_flush(pb);

movenc: Support setting fragment_index before the moov atom is written

Jan 20, 2015

5927

mov->moov_written = 1;

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

5928

if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)

movenc: Rename reserved_moov_pos to reserved_header_pos

Aug 9, 2015

5929

mov->reserved_header_pos = avio_tell(pb);

movenc: Add support for writing fragmented mov files

Jan 5, 2012

5930

}

5931

movenc: Swap positions of mov_write_header and mov_write_packet

May 5, 2010

5932

return 0;

5933

}

5934

movenc: add faststart option for web streaming

Aug 19, 2013

5935

static int get_moov_size(AVFormatContext *s)

5936

{

5937

int ret;

5938

AVIOContext *moov_buf;

5939

MOVMuxContext *mov = s->priv_data;

5940

movenc: Use null buffers for measuring the amount of data to be written

Sep 18, 2013

5941

if ((ret = ffio_open_null_buf(&moov_buf)) < 0)

movenc: add faststart option for web streaming

Aug 19, 2013

5942

return ret;

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

5943

if ((ret = mov_write_moov_tag(moov_buf, mov, s)) < 0)

5944

return ret;

movenc: Use null buffers for measuring the amount of data to be written

Sep 18, 2013

5945

return ffio_close_null_buf(moov_buf);

movenc: add faststart option for web streaming

Aug 19, 2013

5946

}

5947

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

5948

static int get_sidx_size(AVFormatContext *s)

5949

{

5950

int ret;

5951

AVIOContext *buf;

5952

MOVMuxContext *mov = s->priv_data;

5953

5954

if ((ret = ffio_open_null_buf(&buf)) < 0)

5955

return ret;

5956

mov_write_sidx_tags(buf, mov, -1, 0);

5957

return ffio_close_null_buf(buf);

5958

}

5959

movenc: add faststart option for web streaming

Aug 19, 2013

5960

/*

lavf/movenc: add faststart option.

Sep 20, 2012

5961

* This function gets the moov size if moved to the top of the file: the chunk

5962

* offset table can switch between stco (32-bit entries) to co64 (64-bit

movenc: add faststart option for web streaming

Aug 19, 2013

5963

* entries) when the moov is moved to the beginning, so the size of the moov

5964

* would change. It also updates the chunk offset tables.

lavf/movenc: add faststart option.

Sep 20, 2012

5965

*/

5966

static int compute_moov_size(AVFormatContext *s)

5967

{

5968

int i, moov_size, moov_size2;

5969

MOVMuxContext *mov = s->priv_data;

5970

5971

moov_size = get_moov_size(s);

5972

if (moov_size < 0)

5973

return moov_size;

5974

5975

for (i = 0; i < mov->nb_streams; i++)

5976

mov->tracks[i].data_offset += moov_size;

5977

5978

moov_size2 = get_moov_size(s);

5979

if (moov_size2 < 0)

5980

return moov_size2;

5981

movenc: add faststart option for web streaming

Aug 19, 2013

5982

/* if the size changed, we just switched from stco to co64 and need to

lavf/movenc: add faststart option.

Sep 20, 2012

5983

* update the offsets */

5984

if (moov_size2 != moov_size)

5985

for (i = 0; i < mov->nb_streams; i++)

5986

mov->tracks[i].data_offset += moov_size2 - moov_size;

5987

5988

return moov_size2;

5989

}

5990

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

5991

static int compute_sidx_size(AVFormatContext *s)

5992

{

5993

int i, sidx_size;

5994

MOVMuxContext *mov = s->priv_data;

5995

5996

sidx_size = get_sidx_size(s);

5997

if (sidx_size < 0)

5998

return sidx_size;

5999

6000

for (i = 0; i < mov->nb_streams; i++)

6001

mov->tracks[i].data_offset += sidx_size;

6002

6003

return sidx_size;

6004

}

6005

lavf/movenc: add faststart option.

Sep 20, 2012

6006

static int shift_data(AVFormatContext *s)

6007

{

6008

int ret = 0, moov_size;

6009

MOVMuxContext *mov = s->priv_data;

6010

int64_t pos, pos_end = avio_tell(s->pb);

6011

uint8_t *buf, *read_buf[2];

6012

int read_buf_id = 0;

6013

int read_size[2];

6014

AVIOContext *read_pb;

6015

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

6016

if (mov->flags & FF_MOV_FLAG_FRAGMENT)

6017

moov_size = compute_sidx_size(s);

6018

else

6019

moov_size = compute_moov_size(s);

lavf/movenc: add faststart option.

Sep 20, 2012

6020

if (moov_size < 0)

6021

return moov_size;

6022

6023

buf = av_malloc(moov_size * 2);

6024

if (!buf)

6025

return AVERROR(ENOMEM);

6026

read_buf[0] = buf;

6027

read_buf[1] = buf + moov_size;

6028

6029

/* Shift the data: the AVIO context of the output can only be used for

6030

* writing, so we re-open the same output, but for reading. It also avoids

6031

* a read/seek/write/seek back and forth. */

6032

avio_flush(s->pb);

lavf: allow custom IO for all files

Jan 16, 2016

6033

ret = s->io_open(s, &read_pb, s->filename, AVIO_FLAG_READ, NULL);

lavf/movenc: add faststart option.

Sep 20, 2012

6034

if (ret < 0) {

6035

av_log(s, AV_LOG_ERROR, "Unable to re-open %s output file for "

6036

"the second pass (faststart)\n", s->filename);

6037

goto end;

6038

}

6039

6040

/* mark the end of the shift to up to the last data we wrote, and get ready

6041

* for writing */

6042

pos_end = avio_tell(s->pb);

movenc: Rename reserved_moov_pos to reserved_header_pos

Aug 9, 2015

6043

avio_seek(s->pb, mov->reserved_header_pos + moov_size, SEEK_SET);

lavf/movenc: add faststart option.

Sep 20, 2012

6044

6045

/* start reading at where the new moov will be placed */

movenc: Rename reserved_moov_pos to reserved_header_pos

Aug 9, 2015

6046

avio_seek(read_pb, mov->reserved_header_pos, SEEK_SET);

lavf/movenc: add faststart option.

Sep 20, 2012

6047

pos = avio_tell(read_pb);

6048

6049

#define READ_BLOCK do {                                                             \

6050

    read_size[read_buf_id] = avio_read(read_pb, read_buf[read_buf_id], moov_size);  \

6051

    read_buf_id ^= 1;                                                               \

6052

} while (0)

6053

6054

/* shift data by chunk of at most moov_size */

6055

READ_BLOCK;

6056

do {

6057

int n;

6058

READ_BLOCK;

6059

n = read_size[read_buf_id];

6060

if (n <= 0)

6061

break;

6062

avio_write(s->pb, read_buf[read_buf_id], n);

6063

pos += n;

6064

} while (pos < pos_end);

lavf: allow custom IO for all files

Jan 16, 2016

6065

ff_format_io_close(s, &read_pb);

lavf/movenc: add faststart option.

Sep 20, 2012

6066

6067

end:

6068

av_free(buf);

6069

return ret;

6070

}

6071

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6072

static int mov_write_trailer(AVFormatContext *s)

6073

{

Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is alre…

Feb 28, 2009

6074

MOVMuxContext *mov = s->priv_data;

avio: rename ByteIOContext to AVIOContext.

Feb 20, 2011

6075

AVIOContext *pb = s->pb;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6076

int res = 0;

simplify

Jun 24, 2006

6077

int i;

movenc: Allow chapters to be written in trailer

Aug 19, 2013

6078

int64_t moov_pos;

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6079

avformat/movenc: allow rewriting extradata

Aug 17, 2016

6080

if (mov->need_rewrite_extradata) {

6081

for (i = 0; i < s->nb_streams; i++) {

6082

MOVTrack *track = &mov->tracks[i];

6083

AVCodecParameters *par = track->par;

6084

6085

track->vos_len = par->extradata_size;

6086

track->vos_data = av_malloc(track->vos_len);

lavf/movenc: add deinit function

Apr 8, 2016

6087

if (!track->vos_data)

6088

return AVERROR(ENOMEM);

avformat/movenc: allow rewriting extradata

Aug 17, 2016

6089

memcpy(track->vos_data, par->extradata, track->vos_len);

6090

}

6091

mov->need_rewrite_extradata = 0;

6092

}

6093

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

6094

/*

6095

* Before actually writing the trailer, make sure that there are no

6096

* dangling subtitles, that need a terminating sample.

6097

*/

6098

for (i = 0; i < mov->nb_streams; i++) {

6099

MOVTrack *trk = &mov->tracks[i];

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Apr 10, 2016

6100

if (trk->par->codec_id == AV_CODEC_ID_MOV_TEXT &&

movenc: Handle need for extra packets to express subtitle duration.

Jun 24, 2012

6101

!trk->last_sample_is_subtitle_end) {

6102

mov_write_subtitle_end_packet(s, i, trk->track_duration);

6103

trk->last_sample_is_subtitle_end = 1;

6104

}

6105

}

6106

movenc: Allow chapters to be written in trailer

Aug 19, 2013

6107

// If there were no chapters when the header was written, but there

6108

// are chapters now, write them in the trailer. This only works

6109

// when we are not doing fragments.

6110

if (!mov->chapter_track && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) {

6111

if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters) {

6112

mov->chapter_track = mov->nb_streams++;

movenc: Check for errors from mov_create_chapter_track

Aug 26, 2013

6113

if ((res = mov_create_chapter_track(s, mov->chapter_track)) < 0)

lavf/movenc: add deinit function

Apr 8, 2016

6114

return res;

movenc: Allow chapters to be written in trailer

Aug 19, 2013

6115

}

6116

}

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6117

movenc: Add support for writing fragmented mov files

Jan 5, 2012

6118

if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) {

movenc: add faststart option for web streaming

Aug 19, 2013

6119

moov_pos = avio_tell(pb);

6120

movenc: Reindent a block

Jan 25, 2012

6121

/* Write size of mdat tag */

6122

if (mov->mdat_size + 8 <= UINT32_MAX) {

6123

avio_seek(pb, mov->mdat_pos, SEEK_SET);

6124

avio_wb32(pb, mov->mdat_size + 8);

6125

} else {

6126

/* overwrite 'wide' placeholder atom */

6127

avio_seek(pb, mov->mdat_pos - 8, SEEK_SET);

6128

/* special value: real atom size will be 64 bit value after

6129

* tag field */

6130

avio_wb32(pb, 1);

6131

ffio_wfourcc(pb, "mdat");

6132

avio_wb64(pb, mov->mdat_size + 16);

6133

}

Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'

Aug 10, 2015

6134

        avio_seek(pb, mov->reserved_moov_size > 0 ? mov->reserved_header_pos : moov_pos, SEEK_SET);

lavf/movenc: add faststart option.

Sep 20, 2012

6135

movenc: add faststart option for web streaming

Aug 19, 2013

6136

if (mov->flags & FF_MOV_FLAG_FASTSTART) {

6137

            av_log(s, AV_LOG_INFO, "Starting second pass: moving the moov atom to the beginning of the file\n");

lavf/movenc: add faststart option.

Sep 20, 2012

6138

res = shift_data(s);

avformat/movenc: propagate shift_data errors properly

May 29, 2016

6139

if (res < 0)

lavf/movenc: add deinit function

Apr 8, 2016

6140

return res;

avformat/movenc: remove useless if and reindent

May 29, 2016

6141

avio_seek(pb, mov->reserved_header_pos, SEEK_SET);

6142

if ((res = mov_write_moov_tag(pb, mov, s)) < 0)

lavf/movenc: add deinit function

Apr 8, 2016

6143

return res;

lavf/movenc: add faststart option.

Sep 20, 2012

6144

} else if (mov->reserved_moov_size > 0) {

6145

int64_t size;

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

6146

if ((res = mov_write_moov_tag(pb, mov, s)) < 0)

lavf/movenc: add deinit function

Apr 8, 2016

6147

return res;

Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'

Aug 10, 2015

6148

size = mov->reserved_moov_size - (avio_tell(pb) - mov->reserved_header_pos);

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

Jul 8, 2013

6149

if (size < 8){

Merge remote-tracking branch 'qatar/master'

Jan 26, 2012

6150

                av_log(s, AV_LOG_ERROR, "reserved_moov_size is too small, needed %"PRId64" additional\n", 8-size);

lavf/movenc: add deinit function

Apr 8, 2016

6151

return AVERROR(EINVAL);

Merge remote-tracking branch 'qatar/master'

Jan 26, 2012

6152

}

6153

avio_wb32(pb, size);

6154

ffio_wfourcc(pb, "free");

Write valid free atom when -moov_size is specified.

Jul 18, 2014

6155

ffio_fill(pb, 0, size - 8);

Merge remote-tracking branch 'qatar/master'

Jan 26, 2012

6156

avio_seek(pb, moov_pos, SEEK_SET);

lavf/movenc: add faststart option.

Sep 20, 2012

6157

} else {

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

6158

if ((res = mov_write_moov_tag(pb, mov, s)) < 0)

lavf/movenc: add deinit function

Apr 8, 2016

6159

return res;

movenc: reserved_moov_size, which allows placing moov at the begin of…

Oct 26, 2011

6160

}

avformat/movenc: Check failure of allocation of ctts_entries and prop…

Jan 25, 2015

6161

res = 0;

movenc: Add support for writing fragmented mov files

Jan 5, 2012

6162

} else {

movenc: Honor flush requests with delay_moov, when some tracks lack s…

Oct 20, 2015

6163

mov_auto_flush_fragment(s, 1);

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

6164

for (i = 0; i < mov->nb_streams; i++)

6165

mov->tracks[i].data_offset = 0;

movenc: Add a new flag for writing global sidx indexes for dash

Aug 9, 2015

6166

if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) {

avformat/movenc: remove useless if and reindent

May 29, 2016

6167

int64_t end;

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

6168

av_log(s, AV_LOG_INFO, "Starting second pass: inserting sidx atoms\n");

6169

res = shift_data(s);

avformat/movenc: propagate shift_data errors properly

May 29, 2016

6170

if (res < 0)

lavf/movenc: add deinit function

Apr 8, 2016

6171

return res;

avformat/movenc: remove useless if and reindent

May 29, 2016

6172

end = avio_tell(pb);

6173

avio_seek(pb, mov->reserved_header_pos, SEEK_SET);

6174

mov_write_sidx_tags(pb, mov, -1, 0);

6175

avio_seek(pb, end, SEEK_SET);

Merge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'

Jun 23, 2016

6176

avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);

avformat/movenc: remove useless if and reindent

May 29, 2016

6177

mov_write_mfra_tag(pb, mov);

movenc: Add an option for skipping writing the mfra/tfra/mfro trailer

Jun 13, 2016

6178

} else if (!(mov->flags & FF_MOV_FLAG_SKIP_TRAILER)) {

movenc: Provide output bytestream markers for fragmented content

May 4, 2016

6179

avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);

movenc: Allow writing a DASH sidx atom at the start of files

Oct 21, 2014

6180

mov_write_mfra_tag(pb, mov);

6181

}

movenc: reserved_moov_size, which allows placing moov at the begin of…

Oct 26, 2011

6182

}

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6183

6184

return res;

6185

}

6186

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6187

static int mov_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt)

6188

{

6189

int ret = 1;

6190

AVStream *st = s->streams[pkt->stream_index];

6191

6192

if (st->codecpar->codec_id == AV_CODEC_ID_AAC) {

6193

if (pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0)

6194

ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL);

6195

}

6196

6197

return ret;

6198

}

6199

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Jan 13, 2009

6200

#if CONFIG_MOV_MUXER

lavc/lavf: use unique private classes.

Oct 3, 2011

6201

MOV_CLASS(mov)

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

Jan 25, 2011

6202

AVOutputFormat ff_mov_muxer = {

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6203

.name = "mov",

Improve descriptiveness of a number of codec and container long names

Jul 24, 2012

6204

.long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"),

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6205

.extensions = "mov",

6206

.priv_data_size = sizeof(MOVMuxContext),

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6207

.audio_codec = AV_CODEC_ID_AAC,

lavf: use conditional notation for default codec in muxer declarations.

Jul 21, 2012

6208

.video_codec = CONFIG_LIBX264_ENCODER ?

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6209

AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6210

.init = mov_init,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6211

.write_header = mov_write_header,

movenc: small refactor mov_write_packet

Apr 11, 2012

6212

.write_packet = mov_write_packet,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6213

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6214

.deinit = mov_free,

avformat/movenc: mov/mp4 should support negative timestamps through e…

Apr 26, 2013

6215

    .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6216

.codec_tag = (const AVCodecTag* const []){

6217

ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0

6218

},

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6219

.check_bitstream = mov_check_bitstream,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6220

.priv_class = &mov_muxer_class,

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6221

};

allow individual selection of muxers and demuxers

Jul 10, 2006

6222

#endif

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Jan 13, 2009

6223

#if CONFIG_TGP_MUXER

lavc/lavf: use unique private classes.

Oct 3, 2011

6224

MOV_CLASS(tgp)

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

Jan 25, 2011

6225

AVOutputFormat ff_tgp_muxer = {

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6226

.name = "3gp",

Improve descriptiveness of a number of codec and container long names

Jul 24, 2012

6227

.long_name = NULL_IF_CONFIG_SMALL("3GP (3GPP file format)"),

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6228

.extensions = "3gp",

6229

.priv_data_size = sizeof(MOVMuxContext),

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6230

.audio_codec = AV_CODEC_ID_AMR_NB,

6231

.video_codec = AV_CODEC_ID_H263,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6232

.init = mov_init,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6233

.write_header = mov_write_header,

movenc: small refactor mov_write_packet

Apr 11, 2012

6234

.write_packet = mov_write_packet,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6235

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6236

.deinit = mov_free,

avformat/movenc: mov/mp4 should support negative timestamps through e…

Apr 26, 2013

6237

    .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6238

.codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6239

.check_bitstream = mov_check_bitstream,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6240

.priv_class = &tgp_muxer_class,

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6241

};

allow individual selection of muxers and demuxers

Jul 10, 2006

6242

#endif

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Jan 13, 2009

6243

#if CONFIG_MP4_MUXER

lavc/lavf: use unique private classes.

Oct 3, 2011

6244

MOV_CLASS(mp4)

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

Jan 25, 2011

6245

AVOutputFormat ff_mp4_muxer = {

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6246

.name = "mp4",

Improve descriptiveness of a number of codec and container long names

Jul 24, 2012

6247

.long_name = NULL_IF_CONFIG_SMALL("MP4 (MPEG-4 Part 14)"),

avformat/movenc: fix mime-types in movenc.c

Jul 8, 2015

6248

.mime_type = "video/mp4",

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6249

.extensions = "mp4",

6250

.priv_data_size = sizeof(MOVMuxContext),

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6251

.audio_codec = AV_CODEC_ID_AAC,

lavf: use conditional notation for default codec in muxer declarations.

Jul 21, 2012

6252

.video_codec = CONFIG_LIBX264_ENCODER ?

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6253

AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6254

.init = mov_init,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6255

.write_header = mov_write_header,

movenc: small refactor mov_write_packet

Apr 11, 2012

6256

.write_packet = mov_write_packet,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6257

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6258

.deinit = mov_free,

avformat/movenc: mov/mp4 should support negative timestamps through e…

Apr 26, 2013

6259

    .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6260

.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6261

.check_bitstream = mov_check_bitstream,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6262

.priv_class = &mp4_muxer_class,

mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)

Aug 26, 2003

6263

};

allow individual selection of muxers and demuxers

Jul 10, 2006

6264

#endif

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Jan 13, 2009

6265

#if CONFIG_PSP_MUXER

lavc/lavf: use unique private classes.

Oct 3, 2011

6266

MOV_CLASS(psp)

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

Jan 25, 2011

6267

AVOutputFormat ff_psp_muxer = {

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6268

.name = "psp",

Improve descriptiveness of a number of codec and container long names

Jul 24, 2012

6269

.long_name = NULL_IF_CONFIG_SMALL("PSP MP4 (MPEG-4 Part 14)"),

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6270

.extensions = "mp4,psp",

6271

.priv_data_size = sizeof(MOVMuxContext),

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6272

.audio_codec = AV_CODEC_ID_AAC,

lavf: use conditional notation for default codec in muxer declarations.

Jul 21, 2012

6273

.video_codec = CONFIG_LIBX264_ENCODER ?

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6274

AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6275

.init = mov_init,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6276

.write_header = mov_write_header,

movenc: small refactor mov_write_packet

Apr 11, 2012

6277

.write_packet = mov_write_packet,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6278

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6279

.deinit = mov_free,

movenc: Indicate that negative timestamps are supported

Aug 17, 2013

6280

    .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6281

.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6282

.check_bitstream = mov_check_bitstream,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6283

.priv_class = &psp_muxer_class,

Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DO…

Jan 27, 2005

6284

};

allow individual selection of muxers and demuxers

Jul 10, 2006

6285

#endif

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Jan 13, 2009

6286

#if CONFIG_TG2_MUXER

lavc/lavf: use unique private classes.

Oct 3, 2011

6287

MOV_CLASS(tg2)

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

Jan 25, 2011

6288

AVOutputFormat ff_tg2_muxer = {

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6289

.name = "3g2",

Improve descriptiveness of a number of codec and container long names

Jul 24, 2012

6290

.long_name = NULL_IF_CONFIG_SMALL("3GP2 (3GPP2 file format)"),

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6291

.extensions = "3g2",

6292

.priv_data_size = sizeof(MOVMuxContext),

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6293

.audio_codec = AV_CODEC_ID_AMR_NB,

6294

.video_codec = AV_CODEC_ID_H263,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6295

.init = mov_init,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6296

.write_header = mov_write_header,

movenc: small refactor mov_write_packet

Apr 11, 2012

6297

.write_packet = mov_write_packet,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6298

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6299

.deinit = mov_free,

avformat/movenc: mov/mp4 should support negative timestamps through e…

Apr 26, 2013

6300

    .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6301

.codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6302

.check_bitstream = mov_check_bitstream,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6303

.priv_class = &tg2_muxer_class,

quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No …

Feb 16, 2005

6304

};

allow individual selection of muxers and demuxers

Jul 10, 2006

6305

#endif

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Jan 13, 2009

6306

#if CONFIG_IPOD_MUXER

lavc/lavf: use unique private classes.

Oct 3, 2011

6307

MOV_CLASS(ipod)

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

Jan 25, 2011

6308

AVOutputFormat ff_ipod_muxer = {

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6309

.name = "ipod",

Improve descriptiveness of a number of codec and container long names

Jul 24, 2012

6310

.long_name = NULL_IF_CONFIG_SMALL("iPod H.264 MP4 (MPEG-4 Part 14)"),

avformat/movenc: fix mime-types in movenc.c

Jul 8, 2015

6311

.mime_type = "video/mp4",

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6312

.extensions = "m4v,m4a",

6313

.priv_data_size = sizeof(MOVMuxContext),

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6314

.audio_codec = AV_CODEC_ID_AAC,

6315

.video_codec = AV_CODEC_ID_H264,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6316

.init = mov_init,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6317

.write_header = mov_write_header,

movenc: small refactor mov_write_packet

Apr 11, 2012

6318

.write_packet = mov_write_packet,

lavf: use designated initialisers for all (de)muxers.

Jul 16, 2011

6319

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6320

.deinit = mov_free,

avformat/movenc: allow negative TS for the ipod muxer

Jul 4, 2013

6321

    .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6322

.codec_tag = (const AVCodecTag* const []){ codec_ipod_tags, 0 },

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6323

.check_bitstream = mov_check_bitstream,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6324

.priv_class = &ipod_muxer_class,

ipod/iphone compatible mp4 muxer

Mar 16, 2008

6325

};

6326

#endif

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

6327

#if CONFIG_ISMV_MUXER

6328

MOV_CLASS(ismv)

6329

AVOutputFormat ff_ismv_muxer = {

6330

.name = "ismv",

avformat: Drop pointless "format" from container long names

Jul 24, 2012

6331

.long_name = NULL_IF_CONFIG_SMALL("ISMV/ISMA (Smooth Streaming)"),

avformat/movenc: fix mime-types in movenc.c

Jul 8, 2015

6332

.mime_type = "video/mp4",

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

6333

.extensions = "ismv,isma",

6334

.priv_data_size = sizeof(MOVMuxContext),

Replace all CODEC_ID_* with AV_CODEC_ID_*

Aug 5, 2012

6335

.audio_codec = AV_CODEC_ID_AAC,

6336

.video_codec = AV_CODEC_ID_H264,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6337

.init = mov_init,

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

6338

.write_header = mov_write_header,

movenc: small refactor mov_write_packet

Apr 11, 2012

6339

.write_packet = mov_write_packet,

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

6340

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6341

.deinit = mov_free,

movenc: Indicate that negative timestamps are supported

Aug 17, 2013

6342

    .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,

cosmetics: Align muxer/demuxer declarations

Apr 6, 2012

6343

.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6344

.check_bitstream = mov_check_bitstream,

movenc: Add a separate ismv/isma (smooth streaming) muxer

Jan 9, 2012

6345

.priv_class = &ismv_muxer_class,

6346

};

6347

#endif

lavf/movenc: add F4V flavor.

Sep 17, 2012

6348

#if CONFIG_F4V_MUXER

6349

MOV_CLASS(f4v)

6350

AVOutputFormat ff_f4v_muxer = {

6351

.name = "f4v",

6352

.long_name = NULL_IF_CONFIG_SMALL("F4V Adobe Flash Video"),

6353

.mime_type = "application/f4v",

6354

.extensions = "f4v",

6355

.priv_data_size = sizeof(MOVMuxContext),

6356

.audio_codec = AV_CODEC_ID_AAC,

6357

.video_codec = AV_CODEC_ID_H264,

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6358

.init = mov_init,

lavf/movenc: add F4V flavor.

Sep 17, 2012

6359

.write_header = mov_write_header,

6360

.write_packet = mov_write_packet,

6361

.write_trailer = mov_write_trailer,

lavf/movenc: add deinit function

Apr 8, 2016

6362

.deinit = mov_free,

lavf/movenc: add F4V flavor.

Sep 17, 2012

6363

.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,

6364

.codec_tag = (const AVCodecTag* const []){ codec_f4v_tags, 0 },

lavf/movenc+dashenc: add automatic bitstream filtering

Apr 8, 2016

6365

.check_bitstream = mov_check_bitstream,

lavf/movenc: add F4V flavor.

Sep 17, 2012

6366

.priv_class = &f4v_muxer_class,

6367

};

6368

#endif

FFmpeg / FFmpeg