highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move zero size hack from ogg.c to utils.c

Browse Source 
Originally committed as revision 2959 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-04-04 18:33:07 +00:00
parent a03cbe5f7f
commit b0c7f5a9d8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ogg.c
View File

@ -73,10 +73,6 @@ static int ogg_write_packet(AVFormatContext *avfcontext,
pts= av_rescale(pts, avctx->sample_rate, AV_TIME_BASE); pts= av_rescale(pts, avctx->sample_rate, AV_TIME_BASE);
if(!size){
// av_log(avfcontext, AV_LOG_DEBUG, "zero packet\n");
return 0;
}
// av_log(avfcontext, AV_LOG_DEBUG, "M%d\n", size); // av_log(avfcontext, AV_LOG_DEBUG, "M%d\n", size);
/* flush header packets so audio starts on a new page */ /* flush header packets so audio starts on a new page */

13
libavformat/utils.c
View File

@ -1698,8 +1698,14 @@ int av_write_frame(AVFormatContext *s, int stream_index, const uint8_t *buf,
st = s->streams[stream_index]; st = s->streams[stream_index];
pts_mask = (1LL << s->pts_wrap_bits) - 1; pts_mask = (1LL << s->pts_wrap_bits) - 1;
ret = s->oformat->write_packet(s, stream_index, buf, size,
st->pts.val & pts_mask); /* HACK/FIXME we skip all zero size audio packets so a encoder can pass pts by outputing zero size packets */
if(st->codec.codec_type==CODEC_TYPE_AUDIO && size==0)
ret = 0;
else
ret = s->oformat->write_packet(s, stream_index, buf, size,
st->pts.val & pts_mask);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1708,9 +1714,8 @@ int av_write_frame(AVFormatContext *s, int stream_index, const uint8_t *buf,
case CODEC_TYPE_AUDIO: case CODEC_TYPE_AUDIO:
frame_size = get_audio_frame_size(&st->codec, size); frame_size = get_audio_frame_size(&st->codec, size);
/* note, we skip the initial 0-size packets as they are most likely equal to the encoder delay, /* HACK/FIXME, we skip the initial 0-size packets as they are most likely equal to the encoder delay,
but it would be better if we had the real timestamps from the encoder */ but it would be better if we had the real timestamps from the encoder */
// av_log(s, AV_LOG_DEBUG, "%d %lld %lld\n", size, st->pts.num, st->pts.val);
if (frame_size >= 0 && (size || st->pts.num!=st->pts.den>>1 || st->pts.val)) { if (frame_size >= 0 && (size || st->pts.num!=st->pts.den>>1 || st->pts.val)) {
av_frac_add(&st->pts, av_frac_add(&st->pts,
(int64_t)s->pts_den * frame_size); (int64_t)s->pts_den * frame_size);