Mercurial > libavformat.hg
annotate flvenc.c @ 6491:b7f807b4cd88 libavformat tip
In mov demuxer, check that nb_streams is valid before using it in read_dac3
| author | bcoudurier |
|---|---|
| date | Tue, 28 Sep 2010 00:33:21 +0000 |
| parents | 29e95ae56fa9 |
| children |
| 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 | 23 #include "internal.h" |
| 3363 | 24 #include "avc.h" |
| 6472 | 25 #include "metadata.h" |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
26 |
| 445 | 27 #undef NDEBUG |
| 28 #include <assert.h> | |
| 29 | |
|
1677
2a85c82b8538
add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents:
1622
diff
changeset
|
30 static const AVCodecTag flv_video_codec_ids[] = { |
|
1606
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
31 {CODEC_ID_FLV1, FLV_CODECID_H263 }, |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
32 {CODEC_ID_FLASHSV, FLV_CODECID_SCREEN}, |
| 5373 | 33 {CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2}, |
|
1606
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
34 {CODEC_ID_VP6F, FLV_CODECID_VP6 }, |
| 1615 | 35 {CODEC_ID_VP6, FLV_CODECID_VP6 }, |
| 3363 | 36 {CODEC_ID_H264, FLV_CODECID_H264 }, |
|
1606
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
37 {CODEC_ID_NONE, 0} |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
38 }; |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
39 |
|
1677
2a85c82b8538
add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents:
1622
diff
changeset
|
40 static const AVCodecTag flv_audio_codec_ids[] = { |
|
1606
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
41 {CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET}, |
| 5461 | 42 {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
|
43 {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
|
44 {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
|
45 {CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET}, |
| 3363 | 46 {CODEC_ID_AAC, FLV_CODECID_AAC >> FLV_AUDIO_CODECID_OFFSET}, |
| 3273 | 47 {CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET}, |
| 5287 | 48 {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
|
49 {CODEC_ID_NONE, 0} |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
50 }; |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
51 |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
52 typedef struct FLVContext { |
| 446 | 53 int reserved; |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
54 int64_t duration_offset; |
|
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
55 int64_t filesize_offset; |
|
1233
99a34915d15a
always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents:
1179
diff
changeset
|
56 int64_t duration; |
| 3363 | 57 int delay; ///< first dts delay for AVC |
| 6385 | 58 int64_t last_video_ts; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
59 } FLVContext; |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
60 |
| 490 | 61 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
|
62 int flags = (enc->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT : FLV_SAMPLESSIZE_8BIT; |
| 490 | 63 |
| 3363 | 64 if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters |
| 65 return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ | FLV_SAMPLESSIZE_16BIT | FLV_STEREO; | |
| 5287 | 66 else if (enc->codec_id == CODEC_ID_SPEEX) { |
| 67 if (enc->sample_rate != 16000) { | |
| 68 av_log(enc, AV_LOG_ERROR, "flv only supports wideband (16kHz) Speex audio\n"); | |
| 69 return -1; | |
| 70 } | |
| 71 if (enc->channels != 1) { | |
| 72 av_log(enc, AV_LOG_ERROR, "flv only supports mono Speex audio\n"); | |
| 73 return -1; | |
| 74 } | |
| 75 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
|
76 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
|
77 "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
|
78 "Player cannot handle this!\n"); |
| 5287 | 79 } |
| 80 return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT; | |
| 81 } else { | |
| 490 | 82 switch (enc->sample_rate) { |
| 83 case 44100: | |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
84 flags |= FLV_SAMPLERATE_44100HZ; |
| 490 | 85 break; |
| 86 case 22050: | |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
87 flags |= FLV_SAMPLERATE_22050HZ; |
| 490 | 88 break; |
| 89 case 11025: | |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
90 flags |= FLV_SAMPLERATE_11025HZ; |
| 490 | 91 break; |
| 92 case 8000: //nellymoser only | |
| 93 case 5512: //not mp3 | |
| 2590 | 94 if(enc->codec_id != CODEC_ID_MP3){ |
| 2591 | 95 flags |= FLV_SAMPLERATE_SPECIAL; |
| 96 break; | |
| 2590 | 97 } |
| 490 | 98 default: |
| 2164 | 99 av_log(enc, AV_LOG_ERROR, "flv does not support that sample rate, choose from (44100, 22050, 11025).\n"); |
| 490 | 100 return -1; |
| 101 } | |
| 3363 | 102 } |
| 490 | 103 |
| 104 if (enc->channels > 1) { | |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
105 flags |= FLV_STEREO; |
| 490 | 106 } |
| 885 | 107 |
| 490 | 108 switch(enc->codec_id){ |
| 109 case CODEC_ID_MP3: | |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
110 flags |= FLV_CODECID_MP3 | FLV_SAMPLESSIZE_16BIT; |
| 490 | 111 break; |
| 5461 | 112 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
|
113 flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_8BIT; |
| 887 | 114 break; |
| 679 | 115 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
|
116 flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_16BIT; |
| 887 | 117 break; |
| 679 | 118 case CODEC_ID_PCM_S16LE: |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
119 flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT; |
| 887 | 120 break; |
| 872 | 121 case CODEC_ID_ADPCM_SWF: |
| 1839 | 122 flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT; |
| 887 | 123 break; |
| 3273 | 124 case CODEC_ID_NELLYMOSER: |
|
3997
637c51f793f1
Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents:
3973
diff
changeset
|
125 if (enc->sample_rate == 8000) { |
|
637c51f793f1
Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents:
3973
diff
changeset
|
126 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
|
127 } else { |
|
637c51f793f1
Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
banan
parents:
3973
diff
changeset
|
128 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
|
129 } |
| 3273 | 130 break; |
| 490 | 131 case 0: |
| 132 flags |= enc->codec_tag<<4; | |
| 133 break; | |
| 134 default: | |
| 822 | 135 av_log(enc, AV_LOG_ERROR, "codec not compatible with flv\n"); |
| 490 | 136 return -1; |
| 137 } | |
| 885 | 138 |
| 490 | 139 return flags; |
| 140 } | |
| 141 | |
|
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
|
142 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
|
143 { |
|
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 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
|
145 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
|
146 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
|
147 } |
|
6b79be0860e3
add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents:
1169
diff
changeset
|
148 |
| 6385 | 149 static void put_avc_eos_tag(ByteIOContext *pb, unsigned ts) { |
| 150 put_byte(pb, FLV_TAG_TYPE_VIDEO); | |
| 151 put_be24(pb, 5); /* Tag Data Size */ | |
| 152 put_be24(pb, ts); /* lower 24 bits of timestamp in ms*/ | |
| 153 put_byte(pb, (ts >> 24) & 0x7F); /* MSB of ts in ms*/ | |
| 154 put_be24(pb, 0); /* StreamId = 0 */ | |
| 155 put_byte(pb, 23); /* ub[4] FrameType = 1, ub[4] CodecId = 7 */ | |
| 156 put_byte(pb, 2); /* AVC end of sequence */ | |
| 157 put_be24(pb, 0); /* Always 0 for AVC EOS. */ | |
| 158 put_be32(pb, 16); /* Size of FLV tag */ | |
| 159 } | |
| 160 | |
|
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
|
161 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
|
162 { |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
163 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
|
164 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
|
165 } |
|
6b79be0860e3
add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents:
1169
diff
changeset
|
166 |
|
1606
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
167 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
|
168 put_byte(pb, AMF_DATA_TYPE_BOOL); |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
169 put_byte(pb, !!b); |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
170 } |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
171 |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
172 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
|
173 { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
174 ByteIOContext *pb = s->pb; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
175 FLVContext *flv = s->priv_data; |
| 3338 | 176 AVCodecContext *audio_enc = NULL, *video_enc = NULL; |
| 177 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
|
178 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
|
179 int metadata_size_pos, data_size; |
| 6472 | 180 AVMetadataTag *tag = NULL; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
181 |
| 446 | 182 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
|
183 AVCodecContext *enc = s->streams[i]->codec; |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5622
diff
changeset
|
184 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
|
185 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
|
186 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
|
187 } 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
|
188 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
|
189 } |
| 3338 | 190 video_enc = enc; |
| 191 if(enc->codec_tag == 0) { | |
|
1606
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
192 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
|
193 return -1; |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
194 } |
|
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
|
195 } else { |
| 3338 | 196 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
|
197 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
|
198 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
|
199 } |
| 3250 | 200 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
|
201 } |
|
24f6e902d77a
set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents:
1553
diff
changeset
|
202 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
|
203 put_byte(pb,1); |
| 3338 | 204 put_byte(pb, FLV_HEADER_FLAG_HASAUDIO * !!audio_enc |
| 205 + 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
|
206 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
|
207 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
|
208 |
|
24f6e902d77a
set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents:
1553
diff
changeset
|
209 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
|
210 if(s->streams[i]->codec->codec_tag == 5){ |
| 446 | 211 put_byte(pb,8); // message type |
| 212 put_be24(pb,0); // include flags | |
| 213 put_be24(pb,0); // time stamp | |
| 214 put_be32(pb,0); // reserved | |
| 215 put_be32(pb,11); // size | |
| 216 flv->reserved=5; | |
| 217 } | |
| 218 } | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
219 |
| 6385 | 220 flv->last_video_ts = -1; |
| 221 | |
|
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
|
222 /* 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
|
223 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
|
224 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
|
225 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
|
226 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
|
227 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
|
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 /* 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
|
230 |
|
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 /* 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
|
232 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
|
233 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
|
234 |
|
6b79be0860e3
add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents:
1169
diff
changeset
|
235 /* 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
|
236 put_byte(pb, AMF_DATA_TYPE_MIXEDARRAY); |
|
5050
3769dc8df347
Fix onMetaData property count in flv files (issue 1206).
cehoyos
parents:
4348
diff
changeset
|
237 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
|
238 |
|
1233
99a34915d15a
always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents:
1179
diff
changeset
|
239 put_amf_string(pb, "duration"); |
|
99a34915d15a
always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents:
1179
diff
changeset
|
240 flv->duration_offset= url_ftell(pb); |
|
5622
a427102c12cd
Guess the duration before converting video and write guessed duration
cehoyos
parents:
5461
diff
changeset
|
241 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
|
242 |
| 3338 | 243 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
|
244 put_amf_string(pb, "width"); |
| 3338 | 245 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
|
246 |
|
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 put_amf_string(pb, "height"); |
| 3338 | 248 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
|
249 |
|
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 put_amf_string(pb, "videodatarate"); |
|
4348
1ce2aaf9c918
Splits the totalbitrate in a videodatarate and audiodatarate part.
benoit
parents:
4251
diff
changeset
|
251 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
|
252 |
|
6b79be0860e3
add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents:
1169
diff
changeset
|
253 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
|
254 put_amf_double(pb, framerate); |
|
1606
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
255 |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
256 put_amf_string(pb, "videocodecid"); |
| 3338 | 257 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
|
258 } |
|
6b79be0860e3
add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents:
1169
diff
changeset
|
259 |
| 3338 | 260 if(audio_enc){ |
|
4348
1ce2aaf9c918
Splits the totalbitrate in a videodatarate and audiodatarate part.
benoit
parents:
4251
diff
changeset
|
261 put_amf_string(pb, "audiodatarate"); |
|
1ce2aaf9c918
Splits the totalbitrate in a videodatarate and audiodatarate part.
benoit
parents:
4251
diff
changeset
|
262 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
|
263 |
|
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
|
264 put_amf_string(pb, "audiosamplerate"); |
| 3338 | 265 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
|
266 |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
267 put_amf_string(pb, "audiosamplesize"); |
| 5461 | 268 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
|
269 |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
270 put_amf_string(pb, "stereo"); |
| 3338 | 271 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
|
272 |
|
8813741f7196
Patch for the FLV muxer to supply more complete metadata
banan
parents:
1558
diff
changeset
|
273 put_amf_string(pb, "audiocodecid"); |
| 3338 | 274 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
|
275 } |
|
6b79be0860e3
add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents:
1169
diff
changeset
|
276 |
| 6472 | 277 while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) { |
| 278 put_amf_string(pb, tag->key); | |
| 279 put_byte(pb, AMF_DATA_TYPE_STRING); | |
| 280 put_amf_string(pb, tag->value); | |
| 281 } | |
| 282 | |
|
1233
99a34915d15a
always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents:
1179
diff
changeset
|
283 put_amf_string(pb, "filesize"); |
|
99a34915d15a
always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents:
1179
diff
changeset
|
284 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
|
285 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
|
286 |
|
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_amf_string(pb, ""); |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
288 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
|
289 |
|
6b79be0860e3
add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents:
1169
diff
changeset
|
290 /* 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
|
291 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
|
292 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
|
293 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
|
294 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
|
295 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
|
296 |
| 3363 | 297 for (i = 0; i < s->nb_streams; i++) { |
| 298 AVCodecContext *enc = s->streams[i]->codec; | |
| 299 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
|
300 int64_t pos; |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5622
diff
changeset
|
301 put_byte(pb, enc->codec_type == AVMEDIA_TYPE_VIDEO ? |
| 3363 | 302 FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO); |
| 303 put_be24(pb, 0); // size patched later | |
| 304 put_be24(pb, 0); // ts | |
| 305 put_byte(pb, 0); // ts ext | |
| 306 put_be24(pb, 0); // streamid | |
| 307 pos = url_ftell(pb); | |
| 308 if (enc->codec_id == CODEC_ID_AAC) { | |
| 309 put_byte(pb, get_audio_flags(enc)); | |
| 310 put_byte(pb, 0); // AAC sequence header | |
| 311 put_buffer(pb, enc->extradata, enc->extradata_size); | |
| 312 } else { | |
| 313 put_byte(pb, enc->codec_tag | FLV_FRAME_KEY); // flags | |
| 314 put_byte(pb, 0); // AVC sequence header | |
| 315 put_be24(pb, 0); // composition time | |
| 316 ff_isom_write_avcc(pb, enc->extradata, enc->extradata_size); | |
| 317 } | |
| 318 data_size = url_ftell(pb) - pos; | |
| 319 url_fseek(pb, -data_size - 10, SEEK_CUR); | |
| 320 put_be24(pb, data_size); | |
| 321 url_fseek(pb, data_size + 10 - 3, SEEK_CUR); | |
| 322 put_be32(pb, data_size + 11); // previous tag size | |
| 323 } | |
| 324 } | |
| 325 | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
326 return 0; |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
327 } |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
328 |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
329 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
|
330 { |
|
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
|
331 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
|
332 |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
333 ByteIOContext *pb = s->pb; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
334 FLVContext *flv = s->priv_data; |
| 6385 | 335 int i; |
| 336 | |
| 337 /* Add EOS tag */ | |
| 338 for (i = 0; i < s->nb_streams; i++) { | |
| 339 AVCodecContext *enc = s->streams[i]->codec; | |
|
6484
29e95ae56fa9
Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
stefano
parents:
6472
diff
changeset
|
340 if (enc->codec_type == AVMEDIA_TYPE_VIDEO && |
| 6385 | 341 enc->codec_id == CODEC_ID_H264) { |
| 342 put_avc_eos_tag(pb, flv->last_video_ts); | |
| 343 } | |
| 344 } | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
345 |
|
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
|
346 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
|
347 |
|
99a34915d15a
always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents:
1179
diff
changeset
|
348 /* update informations */ |
|
99a34915d15a
always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents:
1179
diff
changeset
|
349 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
|
350 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
|
351 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
|
352 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
|
353 |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
354 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
|
355 return 0; |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
356 } |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
357 |
| 468 | 358 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
|
359 { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
360 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
|
361 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
|
362 FLVContext *flv = s->priv_data; |
| 3363 | 363 unsigned ts; |
| 468 | 364 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
|
365 uint8_t *data= NULL; |
| 2302 | 366 int flags, flags_size; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
367 |
|
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
368 // av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", enc->codec_type, timestamp, size); |
| 885 | 369 |
| 3363 | 370 if(enc->codec_id == CODEC_ID_VP6 || enc->codec_id == CODEC_ID_VP6F || |
| 371 enc->codec_id == CODEC_ID_AAC) | |
| 2302 | 372 flags_size= 2; |
| 3363 | 373 else if(enc->codec_id == CODEC_ID_H264) |
| 374 flags_size= 5; | |
| 2302 | 375 else |
| 376 flags_size= 1; | |
| 377 | |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5622
diff
changeset
|
378 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
|
379 put_byte(pb, FLV_TAG_TYPE_VIDEO); |
| 1615 | 380 |
|
1683
8b062c65fe0d
remove now useless codec_tag setting code in muxers
michael
parents:
1679
diff
changeset
|
381 flags = enc->codec_tag; |
| 1615 | 382 if(flags == 0) { |
| 383 av_log(enc, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id); | |
| 384 return -1; | |
| 385 } | |
| 386 | |
|
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
387 flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER; |
| 487 | 388 } else { |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5622
diff
changeset
|
389 assert(enc->codec_type == AVMEDIA_TYPE_AUDIO); |
| 490 | 390 flags = get_audio_flags(enc); |
| 885 | 391 |
| 445 | 392 assert(size); |
| 393 | |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1547
diff
changeset
|
394 put_byte(pb, FLV_TAG_TYPE_AUDIO); |
| 487 | 395 } |
| 396 | |
|
4189
b545084af4b9
check for negative dts value even if bitstream is already formated,
bcoudurier
parents:
3997
diff
changeset
|
397 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
|
398 /* 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
|
399 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
|
400 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
|
401 return -1; |
|
deddee77e4bc
use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents:
4223
diff
changeset
|
402 } |
| 3801 | 403 if (!flv->delay && pkt->dts < 0) |
| 404 flv->delay = -pkt->dts; | |
| 3363 | 405 } |
| 406 | |
| 407 ts = pkt->dts + flv->delay; // add delay to force positive dts | |
|
6484
29e95ae56fa9
Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
stefano
parents:
6472
diff
changeset
|
408 if (enc->codec_type == AVMEDIA_TYPE_VIDEO) { |
| 6385 | 409 if (flv->last_video_ts < ts) |
| 410 flv->last_video_ts = ts; | |
| 411 } | |
| 2302 | 412 put_be24(pb,size + flags_size); |
| 3363 | 413 put_be24(pb,ts); |
|
3802
be10880770f1
timestamps in flv are 32bits _signed_ according to flash player, specs are wrong
bcoudurier
parents:
3801
diff
changeset
|
414 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
|
415 put_be24(pb,flv->reserved); |
| 487 | 416 put_byte(pb,flags); |
| 1615 | 417 if (enc->codec_id == CODEC_ID_VP6) |
| 418 put_byte(pb,0); | |
| 419 if (enc->codec_id == CODEC_ID_VP6F) | |
| 420 put_byte(pb, enc->extradata_size ? enc->extradata[0] : 0); | |
| 3363 | 421 else if (enc->codec_id == CODEC_ID_AAC) |
| 422 put_byte(pb,1); // AAC raw | |
| 423 else if (enc->codec_id == CODEC_ID_H264) { | |
| 424 put_byte(pb,1); // AVC NALU | |
| 3801 | 425 put_be24(pb,pkt->pts - pkt->dts); |
| 3363 | 426 } |
|
4228
deddee77e4bc
use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents:
4223
diff
changeset
|
427 |
|
deddee77e4bc
use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents:
4223
diff
changeset
|
428 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
|
429 |
| 2302 | 430 put_be32(pb,size+flags_size+11); // previous tag size |
| 3363 | 431 flv->duration = FFMAX(flv->duration, pkt->pts + flv->delay + pkt->duration); |
| 885 | 432 |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
433 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
|
434 |
|
deddee77e4bc
use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents:
4223
diff
changeset
|
435 av_free(data); |
|
deddee77e4bc
use ff_avc_parse_nal_units_buf because output size might differ from input size
bcoudurier
parents:
4223
diff
changeset
|
436 |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
437 return 0; |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
438 } |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
439 |
| 1169 | 440 AVOutputFormat flv_muxer = { |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
441 "flv", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3394
diff
changeset
|
442 NULL_IF_CONFIG_SMALL("FLV format"), |
| 759 | 443 "video/x-flv", |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
444 "flv", |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
445 sizeof(FLVContext), |
| 4206 | 446 #if CONFIG_LIBMP3LAME |
| 232 | 447 CODEC_ID_MP3, |
| 1622 | 448 #else // CONFIG_LIBMP3LAME |
|
2755
bb9c77d499dd
Prefer ADPM_SWF instead NONE if no MP3 encoding is compiled in.
alex
parents:
2591
diff
changeset
|
449 CODEC_ID_ADPCM_SWF, |
| 1622 | 450 #endif // CONFIG_LIBMP3LAME |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
451 CODEC_ID_FLV1, |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
452 flv_write_header, |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
453 flv_write_packet, |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
454 flv_write_trailer, |
|
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3424
diff
changeset
|
455 .codec_tag= (const AVCodecTag* const []){flv_video_codec_ids, flv_audio_codec_ids, 0}, |
| 5203 | 456 .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
|
457 }; |
