generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

siff: do not set AVCodecContext.frame_size

Browse Source 
also, properly set AVCodecContext.bits_per_coded_sample, AVStreasm.start_time,
and AVPacket.duration.
This commit is contained in:
Justin Ruggles
2012-02-26 23:27:21 -05:00
parent ec2e767bf3
commit f1e73100d9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/siff.c
View File

@@ -78,10 +78,10 @@ static int create_audio_stream(AVFormatContext *s, SIFFContext *c)
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codec->codec_id = CODEC_ID_PCM_U8; ast->codec->codec_id = CODEC_ID_PCM_U8;
ast->codec->channels = 1; ast->codec->channels = 1;
ast->codec->bits_per_coded_sample = c->bits; ast->codec->bits_per_coded_sample = 8;
ast->codec->sample_rate = c->rate; ast->codec->sample_rate = c->rate;
ast->codec->frame_size = c->block_align;
avpriv_set_pts_info(ast, 16, 1, c->rate); avpriv_set_pts_info(ast, 16, 1, c->rate);
ast->start_time = 0;
return 0; return 0;
} }
@@ -211,9 +211,10 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = 0; pkt->stream_index = 0;
c->curstrm = -1; c->curstrm = -1;
}else{ }else{
if (av_get_packet(s->pb, pkt, c->sndsize - 4) < 0) if ((size = av_get_packet(s->pb, pkt, c->sndsize - 4)) < 0)
return AVERROR(EIO); return AVERROR(EIO);
pkt->stream_index = 1; pkt->stream_index = 1;
pkt->duration = size;
c->curstrm = 0; c->curstrm = 0;
} }
if(!c->cur_frame || c->curstrm) if(!c->cur_frame || c->curstrm)
@@ -224,6 +225,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
size = av_get_packet(s->pb, pkt, c->block_align); size = av_get_packet(s->pb, pkt, c->block_align);
if(size <= 0) if(size <= 0)
return AVERROR(EIO); return AVERROR(EIO);
pkt->duration = size;
} }
return pkt->size; return pkt->size;
} }