RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pulse: set time_base as multiple of sample_rate 

The stream time_base has been changed to be a multiple of the
device sample_rate. Now the frame_duration computation is simpler
and a message will warn about problematic frame_size values.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Federico Simoncelli 2014-01-05 13:03:14 +01:00 committed by Michael Niedermayer
parent d04aceb7d0
commit b13d6c837f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavdevice/pulse_audio_dec.c
View File

@ -54,7 +54,7 @@ static av_cold int pulse_read_header(AVFormatContext *s)
PulseData *pd = s->priv_data;
AVStream *st;
char *device = NULL;
int ret;
int ret, sample_bytes;
enum AVCodecID codec_id =
s->audio_codec_id == AV_CODEC_ID_NONE ? DEFAULT_CODEC_ID : s->audio_codec_id;
const pa_sample_spec ss = { ff_codec_id_to_pulse_format(codec_id),
@ -90,11 +90,17 @@ static av_cold int pulse_read_header(AVFormatContext *s)
st->codec->codec_id = codec_id;
st->codec->sample_rate = pd->sample_rate;
st->codec->channels = pd->channels;
avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */
avpriv_set_pts_info(st, 64, 1, pd->sample_rate); /* 64 bits pts in us */
pd->pts = AV_NOPTS_VALUE;
pd->frame_duration = (pd->frame_size * 1000000LL * 8) /
(pd->sample_rate * pd->channels * av_get_bits_per_sample(codec_id));
sample_bytes = (av_get_bits_per_sample(codec_id) >> 3) * pd->channels;
if (pd->frame_size % sample_bytes) {
av_log(s, AV_LOG_WARNING, "frame_size %i is not divisible by %i "
"(channels * bytes_per_sample) \n", pd->frame_size, sample_bytes);
}
pd->frame_duration = pd->frame_size / sample_bytes;
return 0;
}