virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

gsm demuxer: use generic seeking instead of a gsm-specific function.

Browse Source 
Since packets all contain only a single block, the generic seek function can
be used while still maintaining block-accuracy.
This commit is contained in:
Justin Ruggles
2012-01-09 13:49:52 -05:00
parent 467879eb54
commit f01f6a8474
1 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libavformat/gsmdec.c
View File

@@ -72,39 +72,6 @@ static int gsm_read_header(AVFormatContext *s, AVFormatParameters *ap)
return 0; return 0;
} }
static int gsm_read_seek2(AVFormatContext *s, int stream_index, int64_t min_ts,
int64_t ts, int64_t max_ts, int flags)
{
GSMDemuxerContext *c = s->priv_data;
/* convert timestamps to file positions */
if (!(flags & AVSEEK_FLAG_BYTE)) {
if (stream_index < 0) {
AVRational bitrate_q = { GSM_BLOCK_SAMPLES, c->sample_rate * GSM_BLOCK_SIZE };
ts = av_rescale_q(ts, AV_TIME_BASE_Q, bitrate_q);
min_ts = av_rescale_q(min_ts, AV_TIME_BASE_Q, bitrate_q);
max_ts = av_rescale_q(max_ts, AV_TIME_BASE_Q, bitrate_q);
} else {
ts *= GSM_BLOCK_SIZE;
min_ts *= GSM_BLOCK_SIZE;
max_ts *= GSM_BLOCK_SIZE;
}
}
/* round to nearest block boundary */
ts = (ts + GSM_BLOCK_SIZE / 2) / GSM_BLOCK_SIZE * GSM_BLOCK_SIZE;
ts = FFMAX(0, ts);
/* handle min/max */
while (ts < min_ts)
ts += GSM_BLOCK_SIZE;
while (ts > max_ts)
ts -= GSM_BLOCK_SIZE;
if (ts < min_ts || ts > max_ts)
return -1;
return avio_seek(s->pb, ts, SEEK_SET);
}
static const AVOption options[] = { static const AVOption options[] = {
{ "sample_rate", "", offsetof(GSMDemuxerContext, sample_rate), { "sample_rate", "", offsetof(GSMDemuxerContext, sample_rate),
AV_OPT_TYPE_INT, {.dbl = GSM_SAMPLE_RATE}, 1, INT_MAX / GSM_BLOCK_SIZE, AV_OPT_TYPE_INT, {.dbl = GSM_SAMPLE_RATE}, 1, INT_MAX / GSM_BLOCK_SIZE,
@@ -125,7 +92,7 @@ AVInputFormat ff_gsm_demuxer = {
.priv_data_size = sizeof(GSMDemuxerContext), .priv_data_size = sizeof(GSMDemuxerContext),
.read_header = gsm_read_header, .read_header = gsm_read_header,
.read_packet = gsm_read_packet, .read_packet = gsm_read_packet,
.read_seek2 = gsm_read_seek2, .flags = AVFMT_GENERIC_INDEX,
.extensions = "gsm", .extensions = "gsm",
.value = CODEC_ID_GSM, .value = CODEC_ID_GSM,
.priv_class = &class, .priv_class = &class,