diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 13:00:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 13:01:39 +0100 |
| commit | 4127d97c8de6a1246d4414799f6aa4d8a45e2243 (patch) | |
| tree | 1756cd5113ecfb6c540cf6958ba882615a817c27 | |
| parent | bb7be3b763d37c1e869431a76da7a8a2ddf1d9f9 (diff) | |
| parent | c64f3615118d757dcf76040fe5407bf2b3883206 (diff) | |
| download | ffmpeg-4127d97c8de6a1246d4414799f6aa4d8a45e2243.tar.gz | |
Merge commit 'c64f3615118d757dcf76040fe5407bf2b3883206'
* commit 'c64f3615118d757dcf76040fe5407bf2b3883206':
flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvenc.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index db610d986a..4749fb45b5 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -196,7 +196,7 @@ static void put_amf_bool(AVIOContext *pb, int b) avio_w8(pb, !!b); } -static void write_metadata(AVFormatContext *s) +static void write_metadata(AVFormatContext *s, unsigned int ts) { AVIOContext *pb = s->pb; FLVContext *flv = s->priv_data; @@ -208,7 +208,7 @@ static void write_metadata(AVFormatContext *s) avio_w8(pb, 18); // tag type META metadata_size_pos = avio_tell(pb); avio_wb24(pb, 0); // size of data part (sum of all parts below) - avio_wb24(pb, 0); // timestamp + avio_wb24(pb, ts); // timestamp avio_wb32(pb, 0); // reserved /* now data of data_size size */ @@ -411,7 +411,7 @@ static int flv_write_header(AVFormatContext *s) flv->reserved = 5; } - write_metadata(s); + write_metadata(s, 0); for (i = 0; i < s->nb_streams; i++) { AVCodecContext *enc = s->streams[i]->codec; @@ -497,6 +497,22 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) else flags_size = 1; + if (flv->delay == AV_NOPTS_VALUE) + flv->delay = -pkt->dts; + + if (pkt->dts < -flv->delay) { + av_log(s, AV_LOG_WARNING, + "Packets are not in the proper order with respect to DTS\n"); + return AVERROR(EINVAL); + } + + ts = pkt->dts + flv->delay; // add delay to force positive dts + + if (s->event_flags & AVSTREAM_EVENT_FLAG_METADATA_UPDATED) { + write_metadata(s, ts); + s->event_flags &= ~AVSTREAM_EVENT_FLAG_METADATA_UPDATED; + } + switch (enc->codec_type) { case AVMEDIA_TYPE_VIDEO: avio_w8(pb, FLV_TAG_TYPE_VIDEO); @@ -541,17 +557,6 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_WARNING, "aac bitstream error\n"); } - if (flv->delay == AV_NOPTS_VALUE) - flv->delay = -pkt->dts; - - if (pkt->dts < -flv->delay) { - av_log(s, AV_LOG_WARNING, - "Packets are not in the proper order with respect to DTS\n"); - return AVERROR(EINVAL); - } - - ts = pkt->dts + flv->delay; // add delay to force positive dts - /* check Speex packet duration */ if (enc->codec_id == AV_CODEC_ID_SPEEX && ts - sc->last_ts > 160) av_log(s, AV_LOG_WARNING, "Warning: Speex stream has more than " |