break;
case FLV_CODECID_PCM_LE:
acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break;
+ case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break;
case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break;
case FLV_CODECID_MP3 : acodec->codec_id = CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
case FLV_CODECID_NELLYMOSER_8HZ_MONO:
}
vcodec->extradata[0] = get_byte(s->pb);
return 1; // 1 byte body size adjustment for flv_read_packet()
+ case FLV_CODECID_H264:
+ vcodec->codec_id = CODEC_ID_H264;
+ return 3; // not 4, reading packet type will consume one byte
default:
av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
vcodec->codec_tag = flv_codecid;
if (!st)
return NULL;
st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO;
- av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
+ av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
return st;
}
av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n");
}
+ if((flags & (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
+ != (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
+ s->ctx_flags |= AVFMTCTX_NOHEADER;
+
if(flags & FLV_HEADER_FLAG_HASVIDEO){
if(!create_stream(s, 0))
return AVERROR(ENOMEM);
return 0;
}
+static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size)
+{
+ av_free(st->codec->extradata);
+ st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
+ st->codec->extradata_size = size;
+ get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size);
+ return 0;
+}
+
static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
{
- int ret, i, type, size, pts, flags, is_audio, next, pos;
+ int ret, i, type, size, flags, is_audio, next, pos;
+ unsigned dts;
AVStream *st = NULL;
+ retry:
for(;;){
pos = url_ftell(s->pb);
url_fskip(s->pb, 4); /* size of previous packet */
type = get_byte(s->pb);
size = get_be24(s->pb);
- pts = get_be24(s->pb);
- pts |= get_byte(s->pb) << 24;
-// av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, pts:%d\n", type, size, pts);
+ dts = get_be24(s->pb);
+ dts |= get_byte(s->pb) << 24;
+// av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, dts:%d\n", type, size, dts);
if (url_feof(s->pb))
return AVERROR(EIO);
url_fskip(s->pb, 3); /* stream id, always 0 */
continue;
}
if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
- av_add_index_entry(st, pos, pts, size, 0, AVINDEX_KEYFRAME);
+ av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
break;
}
size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);
}
+ if (st->codec->codec_id == CODEC_ID_AAC ||
+ st->codec->codec_id == CODEC_ID_H264) {
+ int type = get_byte(s->pb);
+ size--;
+ if (st->codec->codec_id == CODEC_ID_H264) {
+ // cts offset ignored because it might to be signed
+ // and would cause pts < dts
+ get_be24(s->pb);
+ }
+ if (type == 0) {
+ if ((ret = flv_get_extradata(s, st, size - 1)) < 0)
+ return ret;
+ goto retry;
+ }
+ }
+
ret= av_get_packet(s->pb, pkt, size - 1);
if (ret <= 0) {
return AVERROR(EIO);
/* note: we need to modify the packet size here to handle the last
packet */
pkt->size = ret;
- pkt->pts = pts;
+ pkt->dts = dts;
pkt->stream_index = st->index;
if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
return ret;
}
-static int flv_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
-static int flv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
-{
- AVStream *st = s->streams[stream_index];
- int index = av_index_search_timestamp(st, timestamp, flags);
- if (index < 0)
- return -1;
- url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
-
- return 0;
-}
-
AVInputFormat flv_demuxer = {
"flv",
- "flv format",
+ NULL_IF_CONFIG_SMALL("FLV format"),
0,
flv_probe,
flv_read_header,
flv_read_packet,
- flv_read_close,
- flv_read_seek,
.extensions = "flv",
.value = CODEC_ID_FLV1,
};