annotate flvenc.c @ 1606:8813741f7196 libavformat

Patch for the FLV muxer to supply more complete metadata in the onMetaData header. Patch by Allan Hsu <allan at counterpop dot net>.
author banan
date Thu, 28 Dec 2006 12:35:22 +0000
parents 24f6e902d77a
children 8e55b4de921c
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
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 The FFmpeg Project.
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"
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
23 #include "riff.h"
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
24
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
25 #undef NDEBUG
c1f88671135b cleanup
michael
parents: 376
diff changeset
26 #include <assert.h>
c1f88671135b cleanup
michael
parents: 376
diff changeset
27
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
28 static const CodecTag flv_video_codec_ids[] = {
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
29 {CODEC_ID_FLV1, FLV_CODECID_H263 },
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
30 {CODEC_ID_FLASHSV, FLV_CODECID_SCREEN},
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
31 {CODEC_ID_VP6F, FLV_CODECID_VP6 },
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
32 {CODEC_ID_NONE, 0}
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
33 };
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
34
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
35 static const CodecTag flv_audio_codec_ids[] = {
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
36 {CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET},
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
37 {CODEC_ID_PCM_S8, FLV_CODECID_PCM_BE >> FLV_AUDIO_CODECID_OFFSET},
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
38 {CODEC_ID_PCM_S16BE, FLV_CODECID_PCM_BE >> FLV_AUDIO_CODECID_OFFSET},
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
39 {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
40 {CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET},
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
41 {CODEC_ID_NONE, 0}
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
42 };
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
43
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
44 typedef struct FLVContext {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
45 int hasAudio;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
46 int hasVideo;
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
47 int reserved;
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
48 offset_t duration_offset;
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
49 offset_t filesize_offset;
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
50 int64_t duration;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
51 } FLVContext;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
52
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
53 static int get_audio_flags(AVCodecContext *enc){
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
54 int flags = (enc->bits_per_sample == 16) ? FLV_SAMPLESSIZE_16BIT : FLV_SAMPLESSIZE_8BIT;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
55
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
56 switch (enc->sample_rate) {
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
57 case 44100:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
58 flags |= FLV_SAMPLERATE_44100HZ;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
59 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
60 case 22050:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
61 flags |= FLV_SAMPLERATE_22050HZ;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
62 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
63 case 11025:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
64 flags |= FLV_SAMPLERATE_11025HZ;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
65 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
66 case 8000: //nellymoser only
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
67 case 5512: //not mp3
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
68 flags |= FLV_SAMPLERATE_SPECIAL;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
69 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
70 default:
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 820
diff changeset
71 av_log(enc, AV_LOG_ERROR, "flv doesnt support that sample rate, choose from (44100, 22050, 11025)\n");
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
72 return -1;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
73 }
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
74
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
75 if (enc->channels > 1) {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
76 flags |= FLV_STEREO;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
77 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
78
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
79 switch(enc->codec_id){
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
80 case CODEC_ID_MP3:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
81 flags |= FLV_CODECID_MP3 | FLV_SAMPLESSIZE_16BIT;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
82 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
83 case CODEC_ID_PCM_S8:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
84 flags |= FLV_CODECID_PCM_BE | FLV_SAMPLESSIZE_8BIT;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
85 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
86 case CODEC_ID_PCM_S16BE:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
87 flags |= FLV_CODECID_PCM_BE | FLV_SAMPLESSIZE_16BIT;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
88 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
89 case CODEC_ID_PCM_S16LE:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
90 flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
91 break;
872
441c59f95305 support transcoding adpcm
alex
parents: 822
diff changeset
92 case CODEC_ID_ADPCM_SWF:
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
93 flags |= FLV_CODECID_ADPCM;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
94 break;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
95 case 0:
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
96 flags |= enc->codec_tag<<4;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
97 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
98 default:
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 820
diff changeset
99 av_log(enc, AV_LOG_ERROR, "codec not compatible with flv\n");
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
100 return -1;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
101 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
102
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
103 return flags;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
104 }
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
105
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
106 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
107 {
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
108 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
109 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
110 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
111 }
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
112
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
113 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
114 {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
115 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
116 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
117 }
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
118
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
119 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
120 put_byte(pb, AMF_DATA_TYPE_BOOL);
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
121 put_byte(pb, !!b);
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
122 }
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
123
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
124 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
125 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
126 ByteIOContext *pb = &s->pb;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
127 FLVContext *flv = s->priv_data;
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
128 int i, width, height, samplerate, samplesize, channels, audiocodecid, videocodecid;
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
129 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
130 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
131
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
132 flv->hasAudio = 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
133 flv->hasVideo = 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
134
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
135 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
136 AVCodecContext *enc = s->streams[i]->codec;
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
137 if (enc->codec_type == CODEC_TYPE_VIDEO) {
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
138 width = enc->width;
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
139 height = enc->height;
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
140 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
141 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
142 } 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
143 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
144 }
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 flv->hasVideo=1;
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
146
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
147 videocodecid = codec_get_tag(flv_video_codec_ids, enc->codec_id);
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
148 if(videocodecid == 0) {
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
149 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
150 return -1;
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
151 }
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
152 } 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
153 flv->hasAudio=1;
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
154 samplerate = enc->sample_rate;
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
155 channels = enc->channels;
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
156
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
157 audiocodecid = codec_get_tag(flv_audio_codec_ids, enc->codec_id);
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
158 samplesize = (enc->codec_id == CODEC_ID_PCM_S8) ? 8 : 16;
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
159
1558
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
160 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
161 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
162 }
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 446
diff changeset
163 av_set_pts_info(s->streams[i], 24, 1, 1000); /* 24 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
164 }
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
165 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
166 put_byte(pb,1);
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
167 put_byte(pb, FLV_HEADER_FLAG_HASAUDIO * flv->hasAudio
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
168 + FLV_HEADER_FLAG_HASVIDEO * flv->hasVideo);
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
169 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
170 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
171
24f6e902d77a set flags correctly in write header instead of seeking back and fixing it in write_trailer()
michael
parents: 1553
diff changeset
172 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
173 if(s->streams[i]->codec->codec_tag == 5){
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
174 put_byte(pb,8); // message type
35447449b8b4 various fixes
michael
parents: 445
diff changeset
175 put_be24(pb,0); // include flags
35447449b8b4 various fixes
michael
parents: 445
diff changeset
176 put_be24(pb,0); // time stamp
35447449b8b4 various fixes
michael
parents: 445
diff changeset
177 put_be32(pb,0); // reserved
35447449b8b4 various fixes
michael
parents: 445
diff changeset
178 put_be32(pb,11); // size
35447449b8b4 various fixes
michael
parents: 445
diff changeset
179 flv->reserved=5;
35447449b8b4 various fixes
michael
parents: 445
diff changeset
180 }
35447449b8b4 various fixes
michael
parents: 445
diff changeset
181 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
182
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 /* 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
184 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
185 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
186 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
187 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
188 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
189
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
190 /* 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
191
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
192 /* 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
193 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
194 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
195
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
196 /* 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
197 put_byte(pb, AMF_DATA_TYPE_MIXEDARRAY);
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
198 put_be32(pb, 5*flv->hasVideo + 4*flv->hasAudio + 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
199
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
200 put_amf_string(pb, "duration");
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
201 flv->duration_offset= url_ftell(pb);
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
202 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
203
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
204 if(flv->hasVideo){
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
205 put_amf_string(pb, "width");
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
206 put_amf_double(pb, width);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
207
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
208 put_amf_string(pb, "height");
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
209 put_amf_double(pb, height);
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
210
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
211 put_amf_string(pb, "videodatarate");
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
212 put_amf_double(pb, s->bit_rate / 1024.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
213
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
214 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
215 put_amf_double(pb, framerate);
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
216
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
217 put_amf_string(pb, "videocodecid");
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
218 put_amf_double(pb, videocodecid);
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
219 }
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
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 if(flv->hasAudio){
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 put_amf_string(pb, "audiosamplerate");
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_amf_double(pb, samplerate);
1606
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
224
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
225 put_amf_string(pb, "audiosamplesize");
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
226 put_amf_double(pb, samplesize);
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
227
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
228 put_amf_string(pb, "stereo");
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
229 put_amf_bool(pb, (channels == 2));
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
230
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
231 put_amf_string(pb, "audiocodecid");
8813741f7196 Patch for the FLV muxer to supply more complete metadata
banan
parents: 1558
diff changeset
232 put_amf_double(pb, audiocodecid);
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 }
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
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
235 put_amf_string(pb, "filesize");
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
236 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
237 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
238
6b79be0860e3 add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
michael
parents: 1169
diff changeset
239 put_amf_string(pb, "");
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
240 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
241
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 /* 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
243 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
244 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
245 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
246 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
247 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
248
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
249 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
250 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
251
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
252 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
253 {
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
254 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
255
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
256 ByteIOContext *pb = &s->pb;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
257 FLVContext *flv = s->priv_data;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
258
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
259 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
260
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
261 /* update informations */
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
262 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
263 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
264 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
265 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
266
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
267 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
268 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
269 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
270
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
271 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
272 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
273 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
274 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
275 FLVContext *flv = s->priv_data;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
276 int size= pkt->size;
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
277 int flags;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
278
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
279 // 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
280
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
281 if (enc->codec_type == CODEC_TYPE_VIDEO) {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
282 put_byte(pb, FLV_TAG_TYPE_VIDEO);
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
283 flags = FLV_CODECID_H263;
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
284 flags |= pkt->flags & PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER;
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
285 } else {
7942c1aa0028 simplify
michael
parents: 468
diff changeset
286 assert(enc->codec_type == CODEC_TYPE_AUDIO);
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
287 flags = get_audio_flags(enc);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
288
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
289 assert(size);
c1f88671135b cleanup
michael
parents: 376
diff changeset
290
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1547
diff changeset
291 put_byte(pb, FLV_TAG_TYPE_AUDIO);
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
292 }
7942c1aa0028 simplify
michael
parents: 468
diff changeset
293
7942c1aa0028 simplify
michael
parents: 468
diff changeset
294 put_be24(pb,size+1); // include flags
7942c1aa0028 simplify
michael
parents: 468
diff changeset
295 put_be24(pb,pkt->pts);
7942c1aa0028 simplify
michael
parents: 468
diff changeset
296 put_be32(pb,flv->reserved);
7942c1aa0028 simplify
michael
parents: 468
diff changeset
297 put_byte(pb,flags);
7942c1aa0028 simplify
michael
parents: 468
diff changeset
298 put_buffer(pb, pkt->data, size);
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
299 put_be32(pb,size+1+11); // previous tag size
1233
99a34915d15a always write duration and file size, fix seeking, progress bar is now active
bcoudurier
parents: 1179
diff changeset
300 flv->duration = pkt->pts + pkt->duration;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
301
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
302 put_flush_packet(pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
303 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
304 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
305
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
306 AVOutputFormat flv_muxer = {
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
307 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
308 "flv format",
759
6418c3b8d8ec fix mimetype
michael
parents: 684
diff changeset
309 "video/x-flv",
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
310 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
311 sizeof(FLVContext),
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
312 #ifdef CONFIG_MP3LAME
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 166
diff changeset
313 CODEC_ID_MP3,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
314 #else // CONFIG_MP3LAME
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
315 CODEC_ID_NONE,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
316 #endif // CONFIG_MP3LAME
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
317 CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
318 flv_write_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
319 flv_write_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
320 flv_write_trailer,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
321 };