/*
- * FLV encoder.
+ * FLV demuxer
* Copyright (c) 2003 The FFmpeg Project.
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *
+ * This demuxer will generate a 1 byte extradata for VP6F content.
+ * It is composed of:
+ * - upper 4bits: difference between encoded width and visible width
+ * - lower 4bits: difference between encoded height and visible height
*/
#include "avformat.h"
+#include "flv.h"
static int flv_probe(AVProbeData *p)
{
return 0;
}
+static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) {
+ int length = get_be16(ioc);
+ if(length >= buffsize) {
+ url_fskip(ioc, length);
+ return -1;
+ }
+
+ get_buffer(ioc, buffer, length);
+
+ buffer[length] = '\0';
+
+ return length;
+}
+
static int flv_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
int offset, flags, size;
-
- s->ctx_flags |= AVFMTCTX_NOHEADER; //ok we have a header but theres no fps, codec type, sample_rate, ...
+ AVStream *st;
url_fskip(&s->pb, 4);
flags = get_byte(&s->pb);
+ if(flags & FLV_HEADER_FLAG_HASVIDEO){
+ st = av_new_stream(s, 0);
+ if (!st)
+ return AVERROR_NOMEM;
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
+ }
+ if(flags & FLV_HEADER_FLAG_HASAUDIO){
+ st = av_new_stream(s, 1);
+ if (!st)
+ return AVERROR_NOMEM;
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
+ av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
+ }
+
offset = get_be32(&s->pb);
if(!url_is_streamed(&s->pb)){
url_fseek(&s->pb, offset, SEEK_SET);
+ s->start_time = 0;
+
return 0;
}
static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
{
- int ret, i, type, size, pts, flags, is_audio, next;
+ int ret, i, type, size, pts, flags, is_audio, next, pos;
AVStream *st = NULL;
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);
next= size + url_ftell(&s->pb);
- if (type == 8) {
+ if (type == FLV_TAG_TYPE_AUDIO) {
is_audio=1;
flags = get_byte(&s->pb);
- } else if (type == 9) {
+ } else if (type == FLV_TAG_TYPE_VIDEO) {
is_audio=0;
flags = get_byte(&s->pb);
- } else if (type == 18 && size > 13+1+4) {
+ } else if (type == FLV_TAG_TYPE_META && size > 13+1+4) {
url_fskip(&s->pb, 13); //onMetaData blah
if(get_byte(&s->pb) == 8){
url_fskip(&s->pb, 4);
tmp[len]=0;
type= get_byte(&s->pb);
- if(type==0){
+ if(type == AMF_DATA_TYPE_NUMBER){
d= av_int2dbl(get_be64(&s->pb));
- }else if(type==2){
+ }else if(type == AMF_DATA_TYPE_STRING){
len= get_be16(&s->pb);
if(len >= sizeof(tmp))
break;
url_fskip(&s->pb, len);
- }else if(type==8){
+ }else if(type == AMF_DATA_TYPE_MIXEDARRAY){
//array
break;
- }else if(type==11){
+ }else if(type == AMF_DATA_TYPE_DATE){
d= av_int2dbl(get_be64(&s->pb));
get_be16(&s->pb);
}
break;
}
if(i == s->nb_streams){
- st = av_new_stream(s, is_audio);
- if (!st)
- return AVERROR_NOMEM;
-
- av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
- st->codec->time_base= (AVRational){1,1000};
+ av_log(NULL, AV_LOG_ERROR, "invalid stream\n");
+ url_fseek(&s->pb, next, SEEK_SET);
+ continue;
}
// av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard);
- if( (st->discard >= AVDISCARD_NONKEY && !((flags >> 4)==1 || is_audio))
- ||(st->discard >= AVDISCARD_BIDIR && ((flags >> 4)==3 && !is_audio))
+ if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio))
+ ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio))
|| st->discard >= AVDISCARD_ALL
){
url_fseek(&s->pb, next, SEEK_SET);
continue;
}
+ if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
+ av_add_index_entry(st, pos, pts, size, 0, AVINDEX_KEYFRAME);
break;
}
if(is_audio){
if(st->codec->sample_rate == 0){
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->channels = (flags&1)+1;
- if((flags >> 4) == 5)
+ st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
+ if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8HZ_MONO)
st->codec->sample_rate= 8000;
else
- st->codec->sample_rate = (44100<<((flags>>2)&3))>>3;
- switch(flags >> 4){/* 0: uncompressed 1: ADPCM 2: mp3 5: Nellymoser 8kHz mono 6: Nellymoser*/
- case 0: if (flags&2) st->codec->codec_id = CODEC_ID_PCM_S16BE;
+ st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
+ switch(flags & FLV_AUDIO_CODECID_MASK) {
+ case FLV_CODECID_PCM_BE: if (flags & FLV_AUDIO_SAMPLESIZE_MASK) st->codec->codec_id = CODEC_ID_PCM_S16BE;
else st->codec->codec_id = CODEC_ID_PCM_S8; break;
- case 1: st->codec->codec_id = CODEC_ID_ADPCM_SWF; break;
- case 2: st->codec->codec_id = CODEC_ID_MP3; break;
+ case FLV_CODECID_ADPCM : st->codec->codec_id = CODEC_ID_ADPCM_SWF; break;
+ case FLV_CODECID_MP3 : st->codec->codec_id = CODEC_ID_MP3 ; st->need_parsing = 1; break;
// this is not listed at FLV but at SWF, strange...
- case 3: if (flags&2) st->codec->codec_id = CODEC_ID_PCM_S16LE;
+ case FLV_CODECID_PCM_LE: if (flags & FLV_AUDIO_SAMPLESIZE_MASK) st->codec->codec_id = CODEC_ID_PCM_S16LE;
else st->codec->codec_id = CODEC_ID_PCM_S8; break;
default:
av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4);
st->codec->codec_tag= (flags >> 4);
}
- st->codec->bits_per_sample = (flags & 2) ? 16 : 8;
+ st->codec->bits_per_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
}
}else{
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- switch(flags & 0xF){
- case 2: st->codec->codec_id = CODEC_ID_FLV1; break;
- case 3: st->codec->codec_id = CODEC_ID_FLASHSV; break;
+ switch(flags & FLV_VIDEO_CODECID_MASK){
+ case FLV_CODECID_H263 : st->codec->codec_id = CODEC_ID_FLV1 ; break;
+ case FLV_CODECID_SCREEN: st->codec->codec_id = CODEC_ID_FLASHSV; break;
+ case FLV_CODECID_VP6 :
+ st->codec->codec_id = CODEC_ID_VP6F;
+ if (st->codec->extradata_size != 1) {
+ st->codec->extradata_size = 1;
+ st->codec->extradata = av_malloc(1);
+ }
+ /* width and height adjustment */
+ st->codec->extradata[0] = get_byte(&s->pb);
+ size--;
+ break;
default:
- av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf);
- st->codec->codec_tag= flags & 0xF;
+ av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & FLV_VIDEO_CODECID_MASK);
+ st->codec->codec_tag = flags & FLV_VIDEO_CODECID_MASK;
}
}
pkt->pts = pts;
pkt->stream_index = st->index;
- if (is_audio || ((flags >> 4)==1))
+ if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
pkt->flags |= PKT_FLAG_KEY;
return ret;
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",
flv_read_header,
flv_read_packet,
flv_read_close,
+ flv_read_seek,
.extensions = "flv",
.value = CODEC_ID_FLV1,
};
-
-int flvdec_init(void)
-{
- av_register_input_format(&flv_demuxer);
- return 0;
-}
projects / ffmpeg / blobdiff