AVCodecContext *acodec = astream->codec;
switch(flv_codecid) {
//no distinction between S16 and S8 PCM codec flags
- case FLV_CODECID_PCM_BE:
- acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16BE; break;
+ case FLV_CODECID_PCM:
+ acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 :
+#ifdef WORDS_BIGENDIAN
+ CODEC_ID_PCM_S16BE;
+#else
+ CODEC_ID_PCM_S16LE;
+#endif
+ 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_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break;
case FLV_CODECID_NELLYMOSER_8HZ_MONO:
acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
case FLV_CODECID_NELLYMOSER:
+ acodec->codec_id = CODEC_ID_NELLYMOSER;
+ break;
default:
av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET);
acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET;
case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break;
case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break;
case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ;
+ case FLV_CODECID_VP6A :
+ if(flv_codecid == FLV_CODECID_VP6A)
+ vcodec->codec_id = CODEC_ID_VP6A;
if(vcodec->extradata_size != 1) {
vcodec->extradata_size = 1;
vcodec->extradata = av_malloc(1);
}
- vcodec->extradata[0] = get_byte(&s->pb);
+ vcodec->extradata[0] = get_byte(s->pb);
return 1; // 1 byte body size adjustment for flv_read_packet()
default:
av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
double num_val;
num_val = 0;
- ioc = &s->pb;
+ ioc = s->pb;
amf_type = get_byte(ioc);
}
else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) {
//some tools, like FLVTool2, write consistently approximate metadata sample rates
- switch((int)num_val) {
- case 44000: acodec->sample_rate = 44100 ; break;
- case 22000: acodec->sample_rate = 22050 ; break;
- case 11000: acodec->sample_rate = 11025 ; break;
- case 5000 : acodec->sample_rate = 5512 ; break;
- default : acodec->sample_rate = num_val;
+ if (!acodec->sample_rate) {
+ switch((int)num_val) {
+ case 44000: acodec->sample_rate = 44100 ; break;
+ case 22000: acodec->sample_rate = 22050 ; break;
+ case 11000: acodec->sample_rate = 11025 ; break;
+ case 5000 : acodec->sample_rate = 5512 ; break;
+ default : acodec->sample_rate = num_val;
+ }
}
}
}
astream = NULL;
vstream = NULL;
keylen = 0;
- ioc = &s->pb;
+ ioc = s->pb;
//first object needs to be "onMetaData" string
type = get_byte(ioc);
return 0;
}
+static AVStream *create_stream(AVFormatContext *s, int is_audio){
+ AVStream *st = av_new_stream(s, is_audio);
+ 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 */
+ return st;
+}
+
static int flv_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
int offset, flags;
- AVStream *st;
- url_fskip(&s->pb, 4);
- flags = get_byte(&s->pb);
+ url_fskip(s->pb, 4);
+ flags = get_byte(s->pb);
/* old flvtool cleared this field */
/* FIXME: better fix needed */
if (!flags) {
}
if(flags & FLV_HEADER_FLAG_HASVIDEO){
- st = av_new_stream(s, 0);
- if (!st)
+ if(!create_stream(s, 0))
return AVERROR(ENOMEM);
- 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)
+ if(!create_stream(s, 1))
return AVERROR(ENOMEM);
- 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);
- url_fseek(&s->pb, offset, SEEK_SET);
+ offset = get_be32(s->pb);
+ url_fseek(s->pb, offset, SEEK_SET);
s->start_time = 0;
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);
- pts = get_be24(&s->pb);
+ 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);
- if (url_feof(&s->pb))
- return AVERROR_IO;
- url_fskip(&s->pb, 4); /* reserved */
+ if (url_feof(s->pb))
+ return AVERROR(EIO);
+ url_fskip(s->pb, 3); /* stream id, always 0 */
flags = 0;
if(size == 0)
continue;
- next= size + url_ftell(&s->pb);
+ next= size + url_ftell(s->pb);
if (type == FLV_TAG_TYPE_AUDIO) {
is_audio=1;
- flags = get_byte(&s->pb);
+ flags = get_byte(s->pb);
} else if (type == FLV_TAG_TYPE_VIDEO) {
is_audio=0;
- flags = get_byte(&s->pb);
+ flags = get_byte(s->pb);
} else {
if (type == FLV_TAG_TYPE_META && size > 13+1+4)
flv_read_metabody(s, next);
else /* skip packet */
av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
- url_fseek(&s->pb, next, SEEK_SET);
+ url_fseek(s->pb, next, SEEK_SET);
continue;
}
}
if(i == s->nb_streams){
av_log(NULL, AV_LOG_ERROR, "invalid stream\n");
- url_fseek(&s->pb, next, SEEK_SET);
- continue;
+ st= create_stream(s, is_audio);
}
// av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard);
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);
+ url_fseek(s->pb, next, SEEK_SET);
continue;
}
if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
}
// if not streamed and no duration from metadata then seek to end to find the duration from the timestamps
- if(!url_is_streamed(&s->pb) && s->duration==AV_NOPTS_VALUE){
+ if(!url_is_streamed(s->pb) && s->duration==AV_NOPTS_VALUE){
int size;
- const int pos= url_ftell(&s->pb);
- const int fsize= url_fsize(&s->pb);
- url_fseek(&s->pb, fsize-4, SEEK_SET);
- size= get_be32(&s->pb);
- url_fseek(&s->pb, fsize-3-size, SEEK_SET);
- if(size == get_be24(&s->pb) + 11){
- s->duration= get_be24(&s->pb) * (int64_t)AV_TIME_BASE / 1000;
+ const int pos= url_ftell(s->pb);
+ const int fsize= url_fsize(s->pb);
+ url_fseek(s->pb, fsize-4, SEEK_SET);
+ size= get_be32(s->pb);
+ url_fseek(s->pb, fsize-3-size, SEEK_SET);
+ if(size == get_be24(s->pb) + 11){
+ s->duration= get_be24(s->pb) * (int64_t)AV_TIME_BASE / 1000;
}
- url_fseek(&s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, pos, SEEK_SET);
}
if(is_audio){
size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);
}
- ret= av_get_packet(&s->pb, pkt, size - 1);
+ ret= av_get_packet(s->pb, pkt, size - 1);
if (ret <= 0) {
- return AVERROR_IO;
+ return AVERROR(EIO);
}
/* note: we need to modify the packet size here to handle the last
packet */
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);
+ url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
return 0;
}
projects / ffmpeg / blobdiff