annotate flvenc.c @ 6455:3f50c7effad1 libavformat

rtsp: 10l, try to update the correct rtp stream This fixes a bug from rev 22917. Now RTSP streams where the individual RTCP sender reports aren't sent at the same time actually are synced properly.
author mstorsjo
date Fri, 03 Sep 2010 07:10:21 +0000
parents ea409874020e
children ae4ea19af762
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
1 /*
1415
3b00fb8ef8e4 replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents: 1358
diff changeset
2 * FLV muxer
4251
77e0c7511d41 cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 4228
diff changeset
3 * Copyright (c) 2003 The FFmpeg Project
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1233
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1233
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1233
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1233
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1233
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
16 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1233
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
20 */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
21 #include "avformat.h"
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
22 #include "flv.h"
6033
c7b98381ec2d Move AVCodecTag from riff.h into internal.h.
cehoyos
parents: 5913
diff changeset
23 #include "internal.h"
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
24 #include "avc.h"
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
25
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
26 #undef NDEBUG
c1f88671135b cleanup
michael
parents: 376
diff changeset
27 #include <assert.h>
c1f88671135b cleanup
michael
parents: 376
diff changeset
28
1677
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
29 static const AVCodecTag flv_video_codec_ids[] = {
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
30 {CODEC_ID_FLV1, FLV_CODECID_H263 },
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
31 {CODEC_ID_FLASHSV, FLV_CODECID_SCREEN},
5373
19a53e99da63 FLV muxer support for Flash screen codec v2
daniel
parents: 5289
diff changeset
32 {CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2},
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
33 {CODEC_ID_VP6F, FLV_CODECID_VP6 },
1615
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
34 {CODEC_ID_VP6, FLV_CODECID_VP6 },
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
35 {CODEC_ID_H264, FLV_CODECID_H264 },
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
36 {CODEC_ID_NONE, 0}
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
37 };
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
38
1677
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
39 static const AVCodecTag flv_audio_codec_ids[] = {
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
40 {CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET},
5461
bb70b4771e0c FLV 8-bit PCM is unsigned, not signed
daniel
parents: 5373
diff changeset
41 {CODEC_ID_PCM_U8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET},
3061
8ae0431d7f43 flv/swf do not have a big endian codec id, they only support
michael
parents: 2771
diff changeset
42 {CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET},
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
43 {CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET},
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
44 {CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET},
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
45 {CODEC_ID_AAC, FLV_CODECID_AAC >> FLV_AUDIO_CODECID_OFFSET},
3273
83a8b43761bc Nellymoser handling in FLV
bwolowiec
parents: 3250
diff changeset
46 {CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET},
5287
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
47 {CODEC_ID_SPEEX, FLV_CODECID_SPEEX >> FLV_AUDIO_CODECID_OFFSET},
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
48 {CODEC_ID_NONE, 0}
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
49 };
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
50
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
51 typedef struct FLVContext {
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
52 int reserved;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3908
diff changeset
53 int64_t duration_offset;
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3908
diff changeset
54 int64_t filesize_offset;
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
55 int64_t duration;
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
56 int delay; ///< first dts delay for AVC
6385
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
57 int64_t last_video_ts;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
58 } FLVContext;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
59
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
60 static int get_audio_flags(AVCodecContext *enc){
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3802
diff changeset
61 int flags = (enc->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT : FLV_SAMPLESSIZE_8BIT;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
62
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
63 if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
64 return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ | FLV_SAMPLESSIZE_16BIT | FLV_STEREO;
5287
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
65 else if (enc->codec_id == CODEC_ID_SPEEX) {
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
66 if (enc->sample_rate != 16000) {
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
67 av_log(enc, AV_LOG_ERROR, "flv only supports wideband (16kHz) Speex audio\n");
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
68 return -1;
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
69 }
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
70 if (enc->channels != 1) {
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
71 av_log(enc, AV_LOG_ERROR, "flv only supports mono Speex audio\n");
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
72 return -1;
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
73 }
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
74 if (enc->frame_size / 320 > 8) {
5289
269fd2e634ba Log a clearer warning message when muxing FLV with Speex containing more than
jbr
parents: 5287
diff changeset
75 av_log(enc, AV_LOG_WARNING, "Warning: Speex stream has more than "
269fd2e634ba Log a clearer warning message when muxing FLV with Speex containing more than
jbr
parents: 5287
diff changeset
76 "8 frames per packet. Adobe Flash "
269fd2e634ba Log a clearer warning message when muxing FLV with Speex containing more than
jbr
parents: 5287
diff changeset
77 "Player cannot handle this!\n");
5287
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
78 }
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
79 return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT;
64e6e0d096b9 Add Speex support to the FLV muxer.
jbr
parents: 5203
diff changeset
80 } else {
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
81 switch (enc->sample_rate) {
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
82 case 44100:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
83 flags |= FLV_SAMPLERATE_44100HZ;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
84 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
85 case 22050:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
86 flags |= FLV_SAMPLERATE_22050HZ;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
87 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
88 case 11025:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
89 flags |= FLV_SAMPLERATE_11025HZ;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
90 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
91 case 8000: //nellymoser only
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
92 case 5512: //not mp3
2590
307c3f7a7862 avoid generating invalid files
michael
parents: 2302
diff changeset
93 if(enc->codec_id != CODEC_ID_MP3){
2591
michael
parents: 2590
diff changeset
94 flags |= FLV_SAMPLERATE_SPECIAL;
michael
parents: 2590
diff changeset
95 break;
2590
307c3f7a7862 avoid generating invalid files
michael
parents: 2302
diff changeset
96 }
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
97 default:
2164
3804e39efbfd misc spelling fixes
diego
parents: 1839
diff changeset
98 av_log(enc, AV_LOG_ERROR, "flv does not support that sample rate, choose from (44100, 22050, 11025).\n");
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
99 return -1;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
100 }
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
101 }
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
102
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
103 if (enc->channels > 1) {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
104 flags |= FLV_STEREO;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
105 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
106
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
107 switch(enc->codec_id){
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
108 case CODEC_ID_MP3:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
109 flags |= FLV_CODECID_MP3 | FLV_SAMPLESSIZE_16BIT;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
110 break;
5461
bb70b4771e0c FLV 8-bit PCM is unsigned, not signed
daniel
parents: 5373
diff changeset
111 case CODEC_ID_PCM_U8:
3061
8ae0431d7f43 flv/swf do not have a big endian codec id, they only support
michael
parents: 2771
diff changeset
112 flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_8BIT;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
113 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
114 case CODEC_ID_PCM_S16BE:
3061
8ae0431d7f43 flv/swf do not have a big endian codec id, they only support
michael
parents: 2771
diff changeset
115 flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_16BIT;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
116 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
117 case CODEC_ID_PCM_S16LE:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
118 flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
119 break;
872
441c59f95305 support transcoding adpcm
alex
parents: 822
diff changeset
120 case CODEC_ID_ADPCM_SWF:
1839
cd4c59c788fc Set FLV_SAMPLESSIZE_16BIT for ADPCM.
banan
parents: 1683
diff changeset
121 flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
122 break;
3273
83a8b43761bc Nellymoser handling in FLV
bwolowiec
parents: 3250
diff changeset
123 case CODEC_ID_NELLYMOSER:
3997
637c51f793f1 Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents: 3973
diff changeset
124 if (enc->sample_rate == 8000) {
637c51f793f1 Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents: 3973
diff changeset
125 flags |= FLV_CODECID_NELLYMOSER_8KHZ_MONO | FLV_SAMPLESSIZE_16BIT;
637c51f793f1 Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents: 3973
diff changeset
126 } else {
637c51f793f1 Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents: 3973
diff changeset
127 flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT;
637c51f793f1 Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents: 3973
diff changeset
128 }
3273
83a8b43761bc Nellymoser handling in FLV
bwolowiec
parents: 3250
diff changeset
129 break;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
130 case 0:
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
131 flags |= enc->codec_tag<<4;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
132 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
133 default:
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 820
diff changeset
134 av_log(enc, AV_LOG_ERROR, "codec not compatible with flv\n");
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
135 return -1;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
136 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
137
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
138 return flags;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
139 }
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
140
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
141 static void put_amf_string(ByteIOContext *pb, const char *str)
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
142 {
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
143 size_t len = strlen(str);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
144 put_be16(pb, len);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
145 put_buffer(pb, str, len);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
146 }
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
147
6385
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
148 static void put_avc_eos_tag(ByteIOContext *pb, unsigned ts) {
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
149 put_byte(pb, FLV_TAG_TYPE_VIDEO);
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
150 put_be24(pb, 5); /* Tag Data Size */
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
151 put_be24(pb, ts); /* lower 24 bits of timestamp in ms*/
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
152 put_byte(pb, (ts >> 24) & 0x7F); /* MSB of ts in ms*/
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
153 put_be24(pb, 0); /* StreamId = 0 */
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
154 put_byte(pb, 23); /* ub[4] FrameType = 1, ub[4] CodecId = 7 */
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
155 put_byte(pb, 2); /* AVC end of sequence */
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
156 put_be24(pb, 0); /* Always 0 for AVC EOS. */
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
157 put_be32(pb, 16); /* Size of FLV tag */
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
158 }
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
159
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
160 static void put_amf_double(ByteIOContext *pb, double d)
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
161 {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
162 put_byte(pb, AMF_DATA_TYPE_NUMBER);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
163 put_be64(pb, av_dbl2int(d));
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
164 }
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
165
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
166 static void put_amf_bool(ByteIOContext *pb, int b) {
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
167 put_byte(pb, AMF_DATA_TYPE_BOOL);
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
168 put_byte(pb, !!b);
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
169 }
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
170
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
171 static int flv_write_header(AVFormatContext *s)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
172 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
173 ByteIOContext *pb = s->pb;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
174 FLVContext *flv = s->priv_data;
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
175 AVCodecContext *audio_enc = NULL, *video_enc = NULL;
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
176 int i;
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
177 double framerate = 0.0;
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
178 int metadata_size_pos, data_size;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
179
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
180 for(i=0; i<s->nb_streams; i++){
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 759
diff changeset
181 AVCodecContext *enc = s->streams[i]->codec;
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5622
diff changeset
182 if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
183 if (s->streams[i]->r_frame_rate.den && s->streams[i]->r_frame_rate.num) {
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
184 framerate = av_q2d(s->streams[i]->r_frame_rate);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
185 } else {
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
186 framerate = 1/av_q2d(s->streams[i]->codec->time_base);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
187 }
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
188 video_enc = enc;
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
189 if(enc->codec_tag == 0) {
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
190 av_log(enc, AV_LOG_ERROR, "video codec not compatible with flv\n");
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
191 return -1;
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
192 }
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
193 } else {
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
194 audio_enc = enc;
1558
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
195 if(get_audio_flags(enc)<0)
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
196 return -1;
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
197 }
3250
9c5e50e5eac0 set wrap bits to 32bit to actually use it
bcoudurier
parents: 3061
diff changeset
198 av_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */
1558
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
199 }
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
200 put_tag(pb,"FLV");
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
201 put_byte(pb,1);
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
202 put_byte(pb, FLV_HEADER_FLAG_HASAUDIO * !!audio_enc
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
203 + FLV_HEADER_FLAG_HASVIDEO * !!video_enc);
1558
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
204 put_be32(pb,9);
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
205 put_be32(pb,0);
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
206
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
207 for(i=0; i<s->nb_streams; i++){
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
208 if(s->streams[i]->codec->codec_tag == 5){
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
209 put_byte(pb,8); // message type
35447449b8b4 various fixes
michael
parents: 445
diff changeset
210 put_be24(pb,0); // include flags
35447449b8b4 various fixes
michael
parents: 445
diff changeset
211 put_be24(pb,0); // time stamp
35447449b8b4 various fixes
michael
parents: 445
diff changeset
212 put_be32(pb,0); // reserved
35447449b8b4 various fixes
michael
parents: 445
diff changeset
213 put_be32(pb,11); // size
35447449b8b4 various fixes
michael
parents: 445
diff changeset
214 flv->reserved=5;
35447449b8b4 various fixes
michael
parents: 445
diff changeset
215 }
35447449b8b4 various fixes
michael
parents: 445
diff changeset
216 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
217
6385
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
218 flv->last_video_ts = -1;
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
219
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
220 /* write meta_tag */
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
221 put_byte(pb, 18); // tag type META
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
222 metadata_size_pos= url_ftell(pb);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
223 put_be24(pb, 0); // size of data part (sum of all parts below)
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
224 put_be24(pb, 0); // time stamp
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
225 put_be32(pb, 0); // reserved
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
226
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
227 /* now data of data_size size */
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
228
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
229 /* first event name as a string */
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
230 put_byte(pb, AMF_DATA_TYPE_STRING);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
231 put_amf_string(pb, "onMetaData"); // 12 bytes
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
232
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
233 /* mixed array (hash) with size and string/type/data tuples */
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
234 put_byte(pb, AMF_DATA_TYPE_MIXEDARRAY);
5050
3769dc8df347 Fix onMetaData property count in flv files (issue 1206).
cehoyos
parents: 4348
diff changeset
235 put_be32(pb, 5*!!video_enc + 5*!!audio_enc + 2); // +2 for duration and file size
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
236
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
237 put_amf_string(pb, "duration");
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
238 flv->duration_offset= url_ftell(pb);
5622
a427102c12cd Guess the duration before converting video and write guessed duration
cehoyos
parents: 5461
diff changeset
239 put_amf_double(pb, s->duration / AV_TIME_BASE); // fill in the guessed duration, it'll be corrected later if incorrect
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
240
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
241 if(video_enc){
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
242 put_amf_string(pb, "width");
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
243 put_amf_double(pb, video_enc->width);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
244
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
245 put_amf_string(pb, "height");
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
246 put_amf_double(pb, video_enc->height);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
247
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
248 put_amf_string(pb, "videodatarate");
4348
1ce2aaf9c918 Splits the totalbitrate in a videodatarate and audiodatarate part.
benoit
parents: 4251
diff changeset
249 put_amf_double(pb, video_enc->bit_rate / 1024.0);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
250
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
251 put_amf_string(pb, "framerate");
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
252 put_amf_double(pb, framerate);
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
253
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
254 put_amf_string(pb, "videocodecid");
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
255 put_amf_double(pb, video_enc->codec_tag);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
256 }
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
257
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
258 if(audio_enc){
4348
1ce2aaf9c918 Splits the totalbitrate in a videodatarate and audiodatarate part.
benoit
parents: 4251
diff changeset
259 put_amf_string(pb, "audiodatarate");
1ce2aaf9c918 Splits the totalbitrate in a videodatarate and audiodatarate part.
benoit
parents: 4251
diff changeset
260 put_amf_double(pb, audio_enc->bit_rate / 1024.0);
1ce2aaf9c918 Splits the totalbitrate in a videodatarate and audiodatarate part.
benoit
parents: 4251
diff changeset
261
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
262 put_amf_string(pb, "audiosamplerate");
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
263 put_amf_double(pb, audio_enc->sample_rate);
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
264
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
265 put_amf_string(pb, "audiosamplesize");
5461
bb70b4771e0c FLV 8-bit PCM is unsigned, not signed
daniel
parents: 5373
diff changeset
266 put_amf_double(pb, audio_enc->codec_id == CODEC_ID_PCM_U8 ? 8 : 16);
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
267
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
268 put_amf_string(pb, "stereo");
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
269 put_amf_bool(pb, audio_enc->channels == 2);
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
270
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
271 put_amf_string(pb, "audiocodecid");
3338
7370e3ec8bda simplify, remove useless vars
bcoudurier
parents: 3273
diff changeset
272 put_amf_double(pb, audio_enc->codec_tag);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
273 }
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
274
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
275 put_amf_string(pb, "filesize");
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
276 flv->filesize_offset= url_ftell(pb);
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
277 put_amf_double(pb, 0); // delayed write
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
278
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
279 put_amf_string(pb, "");
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
280 put_byte(pb, AMF_END_OF_OBJECT);
1179
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
281
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
282 /* write total size of tag */
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
283 data_size= url_ftell(pb) - metadata_size_pos - 10;
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
284 url_fseek(pb, metadata_size_pos, SEEK_SET);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
285 put_be24(pb, data_size);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
286 url_fseek(pb, data_size + 10 - 3, SEEK_CUR);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
287 put_be32(pb, data_size + 11);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
288
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
289 for (i = 0; i < s->nb_streams; i++) {
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
290 AVCodecContext *enc = s->streams[i]->codec;
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
291 if (enc->codec_id == CODEC_ID_AAC || enc->codec_id == CODEC_ID_H264) {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3908
diff changeset
292 int64_t pos;
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5622
diff changeset
293 put_byte(pb, enc->codec_type == AVMEDIA_TYPE_VIDEO ?
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
294 FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO);
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
295 put_be24(pb, 0); // size patched later
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
296 put_be24(pb, 0); // ts
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
297 put_byte(pb, 0); // ts ext
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
298 put_be24(pb, 0); // streamid
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
299 pos = url_ftell(pb);
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
300 if (enc->codec_id == CODEC_ID_AAC) {
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
301 put_byte(pb, get_audio_flags(enc));
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
302 put_byte(pb, 0); // AAC sequence header
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
303 put_buffer(pb, enc->extradata, enc->extradata_size);
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
304 } else {
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
305 put_byte(pb, enc->codec_tag | FLV_FRAME_KEY); // flags
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
306 put_byte(pb, 0); // AVC sequence header
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
307 put_be24(pb, 0); // composition time
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
308 ff_isom_write_avcc(pb, enc->extradata, enc->extradata_size);
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
309 }
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
310 data_size = url_ftell(pb) - pos;
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
311 url_fseek(pb, -data_size - 10, SEEK_CUR);
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
312 put_be24(pb, data_size);
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
313 url_fseek(pb, data_size + 10 - 3, SEEK_CUR);
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
314 put_be32(pb, data_size + 11); // previous tag size
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
315 }
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
316 }
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
317
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
318 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
319 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
320
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
321 static int flv_write_trailer(AVFormatContext *s)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
322 {
166
2271829b6f7e Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
michaelni
parents: 164
diff changeset
323 int64_t file_size;
2271829b6f7e Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
michaelni
parents: 164
diff changeset
324
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
325 ByteIOContext *pb = s->pb;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
326 FLVContext *flv = s->priv_data;
6385
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
327 int i;
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
328
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
329 /* Add EOS tag */
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
330 for (i = 0; i < s->nb_streams; i++) {
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
331 AVCodecContext *enc = s->streams[i]->codec;
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
332 if (enc->codec_type == CODEC_TYPE_VIDEO &&
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
333 enc->codec_id == CODEC_ID_H264) {
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
334 put_avc_eos_tag(pb, flv->last_video_ts);
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
335 }
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
336 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
337
166
2271829b6f7e Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
michaelni
parents: 164
diff changeset
338 file_size = url_ftell(pb);
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
339
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
340 /* update informations */
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
341 url_fseek(pb, flv->duration_offset, SEEK_SET);
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
342 put_amf_double(pb, flv->duration / (double)1000);
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
343 url_fseek(pb, flv->filesize_offset, SEEK_SET);
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
344 put_amf_double(pb, file_size);
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
345
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
346 url_fseek(pb, file_size, SEEK_SET);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
347 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
348 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
349
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
350 static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
351 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
352 ByteIOContext *pb = s->pb;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 759
diff changeset
353 AVCodecContext *enc = s->streams[pkt->stream_index]->codec;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
354 FLVContext *flv = s->priv_data;
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
355 unsigned ts;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
356 int size= pkt->size;
4228
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
357 uint8_t *data= NULL;
2302
33033ec6fc6c set the previous tag size correctly in flv files
michael
parents: 2164
diff changeset
358 int flags, flags_size;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
359
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
360 // av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", enc->codec_type, timestamp, size);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
361
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
362 if(enc->codec_id == CODEC_ID_VP6 || enc->codec_id == CODEC_ID_VP6F ||
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
363 enc->codec_id == CODEC_ID_AAC)
2302
33033ec6fc6c set the previous tag size correctly in flv files
michael
parents: 2164
diff changeset
364 flags_size= 2;
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
365 else if(enc->codec_id == CODEC_ID_H264)
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
366 flags_size= 5;
2302
33033ec6fc6c set the previous tag size correctly in flv files
michael
parents: 2164
diff changeset
367 else
33033ec6fc6c set the previous tag size correctly in flv files
michael
parents: 2164
diff changeset
368 flags_size= 1;
33033ec6fc6c set the previous tag size correctly in flv files
michael
parents: 2164
diff changeset
369
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5622
diff changeset
370 if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
371 put_byte(pb, FLV_TAG_TYPE_VIDEO);
1615
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
372
1683
8b062c65fe0d remove now useless codec_tag setting code in muxers
michael
parents: 1679
diff changeset
373 flags = enc->codec_tag;
1615
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
374 if(flags == 0) {
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
375 av_log(enc, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id);
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
376 return -1;
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
377 }
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
378
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
379 flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER;
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
380 } else {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5622
diff changeset
381 assert(enc->codec_type == AVMEDIA_TYPE_AUDIO);
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
382 flags = get_audio_flags(enc);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
383
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
384 assert(size);
c1f88671135b cleanup
michael
parents: 376
diff changeset
385
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
386 put_byte(pb, FLV_TAG_TYPE_AUDIO);
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
387 }
7942c1aa0028 simplify
michael
parents: 468
diff changeset
388
4189
b545084af4b9 check for negative dts value even if bitstream is already formated,
bcoudurier
parents: 3997
diff changeset
389 if (enc->codec_id == CODEC_ID_H264) {
4228
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
390 /* check if extradata looks like mp4 formated */
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
391 if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
392 if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
393 return -1;
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
394 }
3801
a6400b4fd5cb remove now useless casts
bcoudurier
parents: 3766
diff changeset
395 if (!flv->delay && pkt->dts < 0)
a6400b4fd5cb remove now useless casts
bcoudurier
parents: 3766
diff changeset
396 flv->delay = -pkt->dts;
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
397 }
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
398
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
399 ts = pkt->dts + flv->delay; // add delay to force positive dts
6385
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
400 if (enc->codec_type == CODEC_TYPE_VIDEO) {
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
401 if (flv->last_video_ts < ts)
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
402 flv->last_video_ts = ts;
ea409874020e Add AVC EOS tag to H264-encoded FLV files.
cehoyos
parents: 6033
diff changeset
403 }
2302
33033ec6fc6c set the previous tag size correctly in flv files
michael
parents: 2164
diff changeset
404 put_be24(pb,size + flags_size);
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
405 put_be24(pb,ts);
3802
be10880770f1 timestamps in flv are 32bits _signed_ according to flash player, specs are wrong
bcoudurier
parents: 3801
diff changeset
406 put_byte(pb,(ts >> 24) & 0x7F); // timestamps are 32bits _signed_
2756
8258fb5a6aa0 Honor the 8bit extension (now 32bit instaed 24bit) of the pts field introduced in FLV specification v9.
alex
parents: 2755
diff changeset
407 put_be24(pb,flv->reserved);
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
408 put_byte(pb,flags);
1615
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
409 if (enc->codec_id == CODEC_ID_VP6)
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
410 put_byte(pb,0);
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
411 if (enc->codec_id == CODEC_ID_VP6F)
8e55b4de921c VP6 and flashsv stream copy and muxing support.
banan
parents: 1606
diff changeset
412 put_byte(pb, enc->extradata_size ? enc->extradata[0] : 0);
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
413 else if (enc->codec_id == CODEC_ID_AAC)
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
414 put_byte(pb,1); // AAC raw
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
415 else if (enc->codec_id == CODEC_ID_H264) {
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
416 put_byte(pb,1); // AVC NALU
3801
a6400b4fd5cb remove now useless casts
bcoudurier
parents: 3766
diff changeset
417 put_be24(pb,pkt->pts - pkt->dts);
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
418 }
4228
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
419
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
420 put_buffer(pb, data ? data : pkt->data, size);
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
421
2302
33033ec6fc6c set the previous tag size correctly in flv files
michael
parents: 2164
diff changeset
422 put_be32(pb,size+flags_size+11); // previous tag size
3363
912490c90970 aac and h264 in flv muxing
bcoudurier
parents: 3342
diff changeset
423 flv->duration = FFMAX(flv->duration, pkt->pts + flv->delay + pkt->duration);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
424
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
425 put_flush_packet(pb);
4228
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
426
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
427 av_free(data);
deddee77e4bc use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents: 4223
diff changeset
428
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
429 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
430 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
431
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
432 AVOutputFormat flv_muxer = {
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
433 "flv",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3394
diff changeset
434 NULL_IF_CONFIG_SMALL("FLV format"),
759
6418c3b8d8ec fix mimetype
michael
parents: 684
diff changeset
435 "video/x-flv",
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
436 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
437 sizeof(FLVContext),
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4191
diff changeset
438 #if CONFIG_LIBMP3LAME
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 166
diff changeset
439 CODEC_ID_MP3,
1622
ac2a299df031 variable renaming: mp3lame --> libmp3lame
diego
parents: 1615
diff changeset
440 #else // CONFIG_LIBMP3LAME
2755
bb9c77d499dd Prefer ADPM_SWF instead NONE if no MP3 encoding is compiled in.
alex
parents: 2591
diff changeset
441 CODEC_ID_ADPCM_SWF,
1622
ac2a299df031 variable renaming: mp3lame --> libmp3lame
diego
parents: 1615
diff changeset
442 #endif // CONFIG_LIBMP3LAME
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
443 CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
444 flv_write_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
445 flv_write_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
446 flv_write_trailer,
3766
f062deeedb8d Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents: 3424
diff changeset
447 .codec_tag= (const AVCodecTag* const []){flv_video_codec_ids, flv_audio_codec_ids, 0},
5203
f2828e9ca5b6 Flv should be AVFMT_VARIABLE_FPS.
michael
parents: 5050
diff changeset
448 .flags= AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
449 };