dsicin: fix several audio-related fields in the CIN demuxer

bits_per_coded_sample should be 8.
block_align is calculated incorrectly, but it is not needed anyway.
packet pts should be calculated in samples.
packet duration can be set.
pull/2/head
Justin Ruggles 13 years ago
parent 5bd0343bee
commit 44d2a982ac
  1. 6
      libavformat/dsicin.c

@ -131,9 +131,8 @@ static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->codec_tag = 0; /* no tag */ st->codec->codec_tag = 0; /* no tag */
st->codec->channels = 1; st->codec->channels = 1;
st->codec->sample_rate = 22050; st->codec->sample_rate = 22050;
st->codec->bits_per_coded_sample = 16; st->codec->bits_per_coded_sample = 8;
st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels; st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels;
st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
return 0; return 0;
} }
@ -211,7 +210,8 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = cin->audio_stream_index; pkt->stream_index = cin->audio_stream_index;
pkt->pts = cin->audio_stream_pts; pkt->pts = cin->audio_stream_pts;
cin->audio_stream_pts += cin->audio_buffer_size * 2 / cin->file_header.audio_frame_size; pkt->duration = cin->audio_buffer_size - (pkt->pts == 0);
cin->audio_stream_pts += pkt->duration;
cin->audio_buffer_size = 0; cin->audio_buffer_size = 0;
return 0; return 0;
} }

Loading…
Cancel
Save