Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

flvenc: K&R formatting cosmetics

Browse source
This commit is contained in:
Luca Barbato 2012-06-27 10:16:18 +02:00 • committed by Diego Biurrun
parent a112822597
commit 1cb34ea4fe
1 changed files with 142 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

274
libavformat/flvenc.c
View file

@ -19,41 +19,41 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/dict.h"
#include "libavutil/intfloat.h" #include "libavutil/intfloat.h"
#include "avc.h"
#include "avformat.h" #include "avformat.h"
#include "flv.h" #include "flv.h"
#include "internal.h" #include "internal.h"
#include "avc.h"
#include "metadata.h" #include "metadata.h"
#include "libavutil/dict.h"
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>
static const AVCodecTag flv_video_codec_ids[] = { static const AVCodecTag flv_video_codec_ids[] = {
{CODEC_ID_FLV1, FLV_CODECID_H263 }, { CODEC_ID_FLV1, FLV_CODECID_H263 },
{CODEC_ID_FLASHSV, FLV_CODECID_SCREEN}, { CODEC_ID_FLASHSV, FLV_CODECID_SCREEN },
{CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2}, { CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2 },
{CODEC_ID_VP6F, FLV_CODECID_VP6 }, { CODEC_ID_VP6F, FLV_CODECID_VP6 },
{CODEC_ID_VP6, FLV_CODECID_VP6 }, { CODEC_ID_VP6, FLV_CODECID_VP6 },
{CODEC_ID_H264, FLV_CODECID_H264 }, { CODEC_ID_H264, FLV_CODECID_H264 },
{CODEC_ID_NONE, 0} { CODEC_ID_NONE, 0 }
}; };
static const AVCodecTag flv_audio_codec_ids[] = { static const AVCodecTag flv_audio_codec_ids[] = {
{CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_PCM_U8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_PCM_U8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_AAC, FLV_CODECID_AAC >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_AAC, FLV_CODECID_AAC >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_SPEEX, FLV_CODECID_SPEEX >> FLV_AUDIO_CODECID_OFFSET}, { CODEC_ID_SPEEX, FLV_CODECID_SPEEX >> FLV_AUDIO_CODECID_OFFSET },
{CODEC_ID_NONE, 0} { CODEC_ID_NONE, 0 }
}; };
typedef struct FLVContext { typedef struct FLVContext {
int reserved; int reserved;
int64_t duration_offset; int64_t duration_offset;
int64_t filesize_offset; int64_t filesize_offset;
int64_t duration; int64_t duration;
@ -66,13 +66,16 @@ typedef struct FLVStreamContext {
static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc) static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc)
{ {
int flags = (enc->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT : FLV_SAMPLESSIZE_8BIT; int flags = (enc->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT
: FLV_SAMPLESSIZE_8BIT;
if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters
return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ | FLV_SAMPLESSIZE_16BIT | FLV_STEREO; return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ |
FLV_SAMPLESSIZE_16BIT | FLV_STEREO;
else if (enc->codec_id == CODEC_ID_SPEEX) { else if (enc->codec_id == CODEC_ID_SPEEX) {
if (enc->sample_rate != 16000) { if (enc->sample_rate != 16000) {
av_log(s, AV_LOG_ERROR, "flv only supports wideband (16kHz) Speex audio\n"); av_log(s, AV_LOG_ERROR,
"flv only supports wideband (16kHz) Speex audio\n");
return -1; return -1;
} }
if (enc->channels != 1) { if (enc->channels != 1) {
@ -81,34 +84,35 @@ static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc)
} }
return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT; return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT;
} else { } else {
switch (enc->sample_rate) { switch (enc->sample_rate) {
case 44100: case 44100:
flags |= FLV_SAMPLERATE_44100HZ; flags |= FLV_SAMPLERATE_44100HZ;
break; break;
case 22050: case 22050:
flags |= FLV_SAMPLERATE_22050HZ; flags |= FLV_SAMPLERATE_22050HZ;
break; break;
case 11025: case 11025:
flags |= FLV_SAMPLERATE_11025HZ; flags |= FLV_SAMPLERATE_11025HZ;
break; break;
case 16000: //nellymoser only case 16000: // nellymoser only
case 8000: //nellymoser only case 8000: // nellymoser only
case 5512: //not mp3 case 5512: // not MP3
if(enc->codec_id != CODEC_ID_MP3){ if (enc->codec_id != CODEC_ID_MP3) {
flags |= FLV_SAMPLERATE_SPECIAL; flags |= FLV_SAMPLERATE_SPECIAL;
break; break;
} }
default: default:
av_log(s, AV_LOG_ERROR, "flv does not support that sample rate, choose from (44100, 22050, 11025).\n"); av_log(s, AV_LOG_ERROR,
"flv does not support that sample rate, "
"choose from (44100, 22050, 11025).\n");
return -1; return -1;
} }
} }
if (enc->channels > 1) { if (enc->channels > 1)
flags |= FLV_STEREO; flags |= FLV_STEREO;
}
switch(enc->codec_id){ switch (enc->codec_id) {
case CODEC_ID_MP3: case CODEC_ID_MP3:
flags |= FLV_CODECID_MP3 | FLV_SAMPLESSIZE_16BIT; flags |= FLV_CODECID_MP3 | FLV_SAMPLESSIZE_16BIT;
break; break;
@ -122,19 +126,18 @@ static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc)
flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT; flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT;
break; break;
case CODEC_ID_ADPCM_SWF: case CODEC_ID_ADPCM_SWF:
flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT; flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT;
break; break;
case CODEC_ID_NELLYMOSER: case CODEC_ID_NELLYMOSER:
if (enc->sample_rate == 8000) { if (enc->sample_rate == 8000)
flags |= FLV_CODECID_NELLYMOSER_8KHZ_MONO | FLV_SAMPLESSIZE_16BIT; flags |= FLV_CODECID_NELLYMOSER_8KHZ_MONO | FLV_SAMPLESSIZE_16BIT;
} else if (enc->sample_rate == 16000) { else if (enc->sample_rate == 16000)
flags |= FLV_CODECID_NELLYMOSER_16KHZ_MONO | FLV_SAMPLESSIZE_16BIT; flags |= FLV_CODECID_NELLYMOSER_16KHZ_MONO | FLV_SAMPLESSIZE_16BIT;
} else { else
flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT; flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT;
}
break; break;
case 0: case 0:
flags |= enc->codec_tag<<4; flags |= enc->codec_tag << 4;
break; break;
default: default:
av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n"); av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n");
@ -151,16 +154,17 @@ static void put_amf_string(AVIOContext *pb, const char *str)
avio_write(pb, str, len); avio_write(pb, str, len);
} }
static void put_avc_eos_tag(AVIOContext *pb, unsigned ts) { static void put_avc_eos_tag(AVIOContext *pb, unsigned ts)
{
avio_w8(pb, FLV_TAG_TYPE_VIDEO); avio_w8(pb, FLV_TAG_TYPE_VIDEO);
avio_wb24(pb, 5); /* Tag Data Size */ avio_wb24(pb, 5); /* Tag Data Size */
avio_wb24(pb, ts); /* lower 24 bits of timestamp in ms*/ avio_wb24(pb, ts); /* lower 24 bits of timestamp in ms */
avio_w8(pb, (ts >> 24) & 0x7F); /* MSB of ts in ms*/ avio_w8(pb, (ts >> 24) & 0x7F); /* MSB of ts in ms */
avio_wb24(pb, 0); /* StreamId = 0 */ avio_wb24(pb, 0); /* StreamId = 0 */
avio_w8(pb, 23); /* ub[4] FrameType = 1, ub[4] CodecId = 7 */ avio_w8(pb, 23); /* ub[4] FrameType = 1, ub[4] CodecId = 7 */
avio_w8(pb, 2); /* AVC end of sequence */ avio_w8(pb, 2); /* AVC end of sequence */
avio_wb24(pb, 0); /* Always 0 for AVC EOS. */ avio_wb24(pb, 0); /* Always 0 for AVC EOS. */
avio_wb32(pb, 16); /* Size of FLV tag */ avio_wb32(pb, 16); /* Size of FLV tag */
} }
static void put_amf_double(AVIOContext *pb, double d) static void put_amf_double(AVIOContext *pb, double d)
@ -169,7 +173,8 @@ static void put_amf_double(AVIOContext *pb, double d)
avio_wb64(pb, av_double2int(d)); avio_wb64(pb, av_double2int(d));
} }
static void put_amf_bool(AVIOContext *pb, int b) { static void put_amf_bool(AVIOContext *pb, int b)
{
avio_w8(pb, AMF_DATA_TYPE_BOOL); avio_w8(pb, AMF_DATA_TYPE_BOOL);
avio_w8(pb, !!b); avio_w8(pb, !!b);
} }
@ -184,18 +189,19 @@ static int flv_write_header(AVFormatContext *s)
int64_t metadata_size_pos, data_size, metadata_count_pos; int64_t metadata_size_pos, data_size, metadata_count_pos;
AVDictionaryEntry *tag = NULL; AVDictionaryEntry *tag = NULL;
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++) {
AVCodecContext *enc = s->streams[i]->codec; AVCodecContext *enc = s->streams[i]->codec;
FLVStreamContext *sc; FLVStreamContext *sc;
switch (enc->codec_type) { switch (enc->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if (s->streams[i]->r_frame_rate.den && s->streams[i]->r_frame_rate.num) { if (s->streams[i]->r_frame_rate.den &&
s->streams[i]->r_frame_rate.num) {
framerate = av_q2d(s->streams[i]->r_frame_rate); framerate = av_q2d(s->streams[i]->r_frame_rate);
} else { } else {
framerate = 1/av_q2d(s->streams[i]->codec->time_base); framerate = 1 / av_q2d(s->streams[i]->codec->time_base);
} }
video_enc = enc; video_enc = enc;
if(enc->codec_tag == 0) { if (enc->codec_tag == 0) {
av_log(s, AV_LOG_ERROR, "video codec not compatible with flv\n"); av_log(s, AV_LOG_ERROR, "video codec not compatible with flv\n");
return -1; return -1;
} }
@ -224,32 +230,32 @@ static int flv_write_header(AVFormatContext *s)
s->streams[i]->priv_data = sc; s->streams[i]->priv_data = sc;
sc->last_ts = -1; sc->last_ts = -1;
} }
flv->delay = AV_NOPTS_VALUE; flv->delay = AV_NOPTS_VALUE;
avio_write(pb, "FLV", 3); avio_write(pb, "FLV", 3);
avio_w8(pb,1); avio_w8(pb, 1);
avio_w8(pb, FLV_HEADER_FLAG_HASAUDIO * !!audio_enc avio_w8(pb, FLV_HEADER_FLAG_HASAUDIO * !!audio_enc +
+ FLV_HEADER_FLAG_HASVIDEO * !!video_enc); FLV_HEADER_FLAG_HASVIDEO * !!video_enc);
avio_wb32(pb,9); avio_wb32(pb, 9);
avio_wb32(pb,0); avio_wb32(pb, 0);
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++)
if(s->streams[i]->codec->codec_tag == 5){ if (s->streams[i]->codec->codec_tag == 5) {
avio_w8(pb,8); // message type avio_w8(pb, 8); // message type
avio_wb24(pb,0); // include flags avio_wb24(pb, 0); // include flags
avio_wb24(pb,0); // time stamp avio_wb24(pb, 0); // time stamp
avio_wb32(pb,0); // reserved avio_wb32(pb, 0); // reserved
avio_wb32(pb,11); // size avio_wb32(pb, 11); // size
flv->reserved=5; flv->reserved = 5;
} }
}
/* write meta_tag */ /* write meta_tag */
avio_w8(pb, 18); // tag type META avio_w8(pb, 18); // tag type META
metadata_size_pos= avio_tell(pb); metadata_size_pos = avio_tell(pb);
avio_wb24(pb, 0); // size of data part (sum of all parts below) avio_wb24(pb, 0); // size of data part (sum of all parts below)
avio_wb24(pb, 0); // time stamp avio_wb24(pb, 0); // timestamp
avio_wb32(pb, 0); // reserved avio_wb32(pb, 0); // reserved
/* now data of data_size size */ /* now data of data_size size */
@ -262,16 +268,18 @@ static int flv_write_header(AVFormatContext *s)
metadata_count_pos = avio_tell(pb); metadata_count_pos = avio_tell(pb);
metadata_count = 5 * !!video_enc + metadata_count = 5 * !!video_enc +
5 * !!audio_enc + 5 * !!audio_enc +
1 * !!data_enc + 1 * !!data_enc +
2; // +2 for duration and file size 2; // +2 for duration and file size
avio_wb32(pb, metadata_count); avio_wb32(pb, metadata_count);
put_amf_string(pb, "duration"); put_amf_string(pb, "duration");
flv->duration_offset= avio_tell(pb); flv->duration_offset= avio_tell(pb);
put_amf_double(pb, s->duration / AV_TIME_BASE); // fill in the guessed duration, it'll be corrected later if incorrect
if(video_enc){ // fill in the guessed duration, it'll be corrected later if incorrect
put_amf_double(pb, s->duration / AV_TIME_BASE);
if (video_enc) {
put_amf_string(pb, "width"); put_amf_string(pb, "width");
put_amf_double(pb, video_enc->width); put_amf_double(pb, video_enc->width);
@ -288,7 +296,7 @@ static int flv_write_header(AVFormatContext *s)
put_amf_double(pb, video_enc->codec_tag); put_amf_double(pb, video_enc->codec_tag);
} }
if(audio_enc){ if (audio_enc) {
put_amf_string(pb, "audiodatarate"); put_amf_string(pb, "audiodatarate");
put_amf_double(pb, audio_enc->bit_rate / 1024.0); put_amf_double(pb, audio_enc->bit_rate / 1024.0);
@ -318,14 +326,14 @@ static int flv_write_header(AVFormatContext *s)
} }
put_amf_string(pb, "filesize"); put_amf_string(pb, "filesize");
flv->filesize_offset= avio_tell(pb); flv->filesize_offset = avio_tell(pb);
put_amf_double(pb, 0); // delayed write put_amf_double(pb, 0); // delayed write
put_amf_string(pb, ""); put_amf_string(pb, "");
avio_w8(pb, AMF_END_OF_OBJECT); avio_w8(pb, AMF_END_OF_OBJECT);
/* write total size of tag */ /* write total size of tag */
data_size= avio_tell(pb) - metadata_size_pos - 10; data_size = avio_tell(pb) - metadata_size_pos - 10;
avio_seek(pb, metadata_count_pos, SEEK_SET); avio_seek(pb, metadata_count_pos, SEEK_SET);
avio_wb32(pb, metadata_count); avio_wb32(pb, metadata_count);
@ -340,10 +348,10 @@ static int flv_write_header(AVFormatContext *s)
if (enc->codec_id == CODEC_ID_AAC || enc->codec_id == CODEC_ID_H264) { if (enc->codec_id == CODEC_ID_AAC || enc->codec_id == CODEC_ID_H264) {
int64_t pos; int64_t pos;
avio_w8(pb, enc->codec_type == AVMEDIA_TYPE_VIDEO ? avio_w8(pb, enc->codec_type == AVMEDIA_TYPE_VIDEO ?
FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO); FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO);
avio_wb24(pb, 0); // size patched later avio_wb24(pb, 0); // size patched later
avio_wb24(pb, 0); // ts avio_wb24(pb, 0); // ts
avio_w8(pb, 0); // ts ext avio_w8(pb, 0); // ts ext
avio_wb24(pb, 0); // streamid avio_wb24(pb, 0); // streamid
pos = avio_tell(pb); pos = avio_tell(pb);
if (enc->codec_id == CODEC_ID_AAC) { if (enc->codec_id == CODEC_ID_AAC) {
@ -380,9 +388,8 @@ static int flv_write_trailer(AVFormatContext *s)
AVCodecContext *enc = s->streams[i]->codec; AVCodecContext *enc = s->streams[i]->codec;
FLVStreamContext *sc = s->streams[i]->priv_data; FLVStreamContext *sc = s->streams[i]->priv_data;
if (enc->codec_type == AVMEDIA_TYPE_VIDEO && if (enc->codec_type == AVMEDIA_TYPE_VIDEO &&
enc->codec_id == CODEC_ID_H264) { enc->codec_id == CODEC_ID_H264)
put_avc_eos_tag(pb, sc->last_ts); put_avc_eos_tag(pb, sc->last_ts);
}
} }
file_size = avio_tell(pb); file_size = avio_tell(pb);
@ -399,32 +406,35 @@ static int flv_write_trailer(AVFormatContext *s)
static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVCodecContext *enc = s->streams[pkt->stream_index]->codec; AVCodecContext *enc = s->streams[pkt->stream_index]->codec;
FLVContext *flv = s->priv_data; FLVContext *flv = s->priv_data;
FLVStreamContext *sc = s->streams[pkt->stream_index]->priv_data; FLVStreamContext *sc = s->streams[pkt->stream_index]->priv_data;
unsigned ts; unsigned ts;
int size= pkt->size; int size = pkt->size;
uint8_t *data= NULL; uint8_t *data = NULL;
int flags, flags_size; int flags, flags_size;
// av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", enc->codec_type, timestamp, size); // av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n",
// enc->codec_type, timestamp, size);
if(enc->codec_id == CODEC_ID_VP6 || enc->codec_id == CODEC_ID_VP6F || if (enc->codec_id == CODEC_ID_VP6 || enc->codec_id == CODEC_ID_VP6F ||
enc->codec_id == CODEC_ID_AAC) enc->codec_id == CODEC_ID_AAC)
flags_size= 2; flags_size = 2;
else if(enc->codec_id == CODEC_ID_H264) else if (enc->codec_id == CODEC_ID_H264)
flags_size= 5; flags_size = 5;
else else
flags_size= 1; flags_size = 1;
switch (enc->codec_type) { switch (enc->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
avio_w8(pb, FLV_TAG_TYPE_VIDEO); avio_w8(pb, FLV_TAG_TYPE_VIDEO);
flags = enc->codec_tag; flags = enc->codec_tag;
if(flags == 0) { if (flags == 0) {
av_log(s, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id); av_log(s, AV_LOG_ERROR,
"video codec %X not compatible with flv\n",
enc->codec_id);
return -1; return -1;
} }
@ -437,44 +447,43 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
avio_w8(pb, FLV_TAG_TYPE_AUDIO); avio_w8(pb, FLV_TAG_TYPE_AUDIO);
break; break;
case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_DATA:
avio_w8(pb, FLV_TAG_TYPE_META); avio_w8(pb, FLV_TAG_TYPE_META);
break; break;
default: default:
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (enc->codec_id == CODEC_ID_H264) {
if (enc->codec_id == CODEC_ID_H264)
/* check if extradata looks like MP4 */ /* check if extradata looks like MP4 */
if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) { if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1)
if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0) if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)
return -1; return -1;
}
}
if (flv->delay == AV_NOPTS_VALUE) if (flv->delay == AV_NOPTS_VALUE)
flv->delay = -pkt->dts; flv->delay = -pkt->dts;
if (pkt->dts < -flv->delay) { if (pkt->dts < -flv->delay) {
av_log(s, AV_LOG_WARNING, "Packets are not in the proper order with " av_log(s, AV_LOG_WARNING,
"respect to DTS\n"); "Packets are not in the proper order with respect to DTS\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
ts = pkt->dts + flv->delay; // add delay to force positive dts ts = pkt->dts + flv->delay; // add delay to force positive dts
/* check Speex packet duration */ /* check Speex packet duration */
if (enc->codec_id == CODEC_ID_SPEEX && ts - sc->last_ts > 160) { if (enc->codec_id == CODEC_ID_SPEEX && ts - sc->last_ts > 160)
av_log(s, AV_LOG_WARNING, "Warning: Speex stream has more than " av_log(s, AV_LOG_WARNING, "Warning: Speex stream has more than "
"8 frames per packet. Adobe Flash " "8 frames per packet. Adobe Flash "
"Player cannot handle this!\n"); "Player cannot handle this!\n");
}
if (sc->last_ts < ts) if (sc->last_ts < ts)
sc->last_ts = ts; sc->last_ts = ts;
avio_wb24(pb,size + flags_size); avio_wb24(pb, size + flags_size);
avio_wb24(pb,ts); avio_wb24(pb, ts);
avio_w8(pb,(ts >> 24) & 0x7F); // timestamps are 32bits _signed_ avio_w8(pb, (ts >> 24) & 0x7F); // timestamps are 32 bits _signed_
avio_wb24(pb,flv->reserved); avio_wb24(pb, flv->reserved);
if (enc->codec_type == AVMEDIA_TYPE_DATA) { if (enc->codec_type == AVMEDIA_TYPE_DATA) {
int data_size; int data_size;
@ -498,25 +507,26 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
avio_seek(pb, data_size + 10 - 3, SEEK_CUR); avio_seek(pb, data_size + 10 - 3, SEEK_CUR);
avio_wb32(pb, data_size + 11); avio_wb32(pb, data_size + 11);
} else { } else {
avio_w8(pb,flags); avio_w8(pb,flags);
if (enc->codec_id == CODEC_ID_VP6) if (enc->codec_id == CODEC_ID_VP6)
avio_w8(pb,0); avio_w8(pb, 0);
if (enc->codec_id == CODEC_ID_VP6F) if (enc->codec_id == CODEC_ID_VP6F)
avio_w8(pb, enc->extradata_size ? enc->extradata[0] : 0); avio_w8(pb, enc->extradata_size ? enc->extradata[0] : 0);
else if (enc->codec_id == CODEC_ID_AAC) else if (enc->codec_id == CODEC_ID_AAC)
avio_w8(pb,1); // AAC raw avio_w8(pb, 1); // AAC raw
else if (enc->codec_id == CODEC_ID_H264) { else if (enc->codec_id == CODEC_ID_H264) {
avio_w8(pb,1); // AVC NALU avio_w8(pb, 1); // AVC NALU
avio_wb24(pb,pkt->pts - pkt->dts); avio_wb24(pb, pkt->pts - pkt->dts);
}
avio_write(pb, data ? data : pkt->data, size);
avio_wb32(pb, size + flags_size + 11); // previous tag size
flv->duration = FFMAX(flv->duration,
pkt->pts + flv->delay + pkt->duration);
} }
avio_write(pb, data ? data : pkt->data, size);
avio_wb32(pb,size+flags_size+11); // previous tag size
flv->duration = FFMAX(flv->duration, pkt->pts + flv->delay + pkt->duration);
}
avio_flush(pb); avio_flush(pb);
av_free(data); av_free(data);
return pb->error; return pb->error;
@ -537,9 +547,9 @@ AVOutputFormat ff_flv_muxer = {
.write_header = flv_write_header, .write_header = flv_write_header,
.write_packet = flv_write_packet, .write_packet = flv_write_packet,
.write_trailer = flv_write_trailer, .write_trailer = flv_write_trailer,
.codec_tag = (const AVCodecTag* const []){ .codec_tag = (const AVCodecTag* const []) {
flv_video_codec_ids, flv_audio_codec_ids, 0 flv_video_codec_ids, flv_audio_codec_ids, 0
}, },
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
AVFMT_TS_NONSTRICT, AVFMT_TS_NONSTRICT,
}; };