* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/channel_layout.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "avformat.h"
+#include "internal.h"
#define GSM_BLOCK_SIZE 33
#define GSM_BLOCK_SAMPLES 160
{
int ret, size;
- size = GSM_BLOCK_SIZE * 32;
-
- if (av_new_packet(pkt, size) < 0)
- return AVERROR(ENOMEM);
+ size = GSM_BLOCK_SIZE;
pkt->pos = avio_tell(s->pb);
pkt->stream_index = 0;
return ret < 0 ? ret : AVERROR(EIO);
}
pkt->size = ret;
- pkt->duration = ret / GSM_BLOCK_SIZE;
+ pkt->duration = 1;
pkt->pts = pkt->pos / GSM_BLOCK_SIZE;
return 0;
}
-static int gsm_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int gsm_read_header(AVFormatContext *s)
{
GSMDemuxerContext *c = s->priv_data;
AVStream *st = avformat_new_stream(s, NULL);
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = s->iformat->value;
+ st->codec->codec_id = s->iformat->raw_codec_id;
st->codec->channels = 1;
+ st->codec->channel_layout = AV_CH_LAYOUT_MONO;
st->codec->sample_rate = c->sample_rate;
- st->codec->block_align = GSM_BLOCK_SIZE;
st->codec->bit_rate = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES;
- av_set_pts_info(st, 64, GSM_BLOCK_SAMPLES, GSM_SAMPLE_RATE);
+ avpriv_set_pts_info(st, 64, GSM_BLOCK_SAMPLES, GSM_SAMPLE_RATE);
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[] = {
{ "sample_rate", "", offsetof(GSMDemuxerContext, sample_rate),
- AV_OPT_TYPE_INT, {.dbl = GSM_SAMPLE_RATE}, 1, INT_MAX / GSM_BLOCK_SIZE,
+ AV_OPT_TYPE_INT, {.i64 = GSM_SAMPLE_RATE}, 1, INT_MAX / GSM_BLOCK_SIZE,
AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
.priv_data_size = sizeof(GSMDemuxerContext),
.read_header = gsm_read_header,
.read_packet = gsm_read_packet,
- .read_seek2 = gsm_read_seek2,
+ .flags = AVFMT_GENERIC_INDEX,
.extensions = "gsm",
- .value = CODEC_ID_GSM,
+ .raw_codec_id = AV_CODEC_ID_GSM,
.priv_class = &class,
};