#include <stdlib.h>
#include "libavutil/bswap.h"
#include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h"
#include "avformat.h"
+#include "internal.h"
#include "oggdec.h"
struct speex_params {
+ int packet_size;
int final_packet_duration;
+ int seq;
};
static int speex_header(AVFormatContext *s, int idx) {
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
+ struct speex_params *spxp = os->private;
AVStream *st = s->streams[idx];
uint8_t *p = os->buf + os->pstart;
- if (os->seq > 1)
+ if (!spxp) {
+ spxp = av_mallocz(sizeof(*spxp));
+ if (!spxp)
+ return AVERROR(ENOMEM);
+ os->private = spxp;
+ }
+
+ if (spxp->seq > 1)
return 0;
- if (os->seq == 0) {
+ if (spxp->seq == 0) {
int frames_per_packet;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_SPEEX;
-
- st->codec->sample_rate = AV_RL32(p + 36);
- st->codec->channels = AV_RL32(p + 48);
-
- /* We treat the whole Speex packet as a single frame everywhere Speex
- is handled in FFmpeg. This avoids the complexities of splitting
- and joining individual Speex frames, which are not always
- byte-aligned. */
- st->codec->frame_size = AV_RL32(p + 56);
- frames_per_packet = AV_RL32(p + 64);
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_SPEEX;
+
+ st->codecpar->sample_rate = AV_RL32(p + 36);
+ st->codecpar->channels = AV_RL32(p + 48);
+ if (st->codecpar->channels < 1 || st->codecpar->channels > 2) {
+ av_log(s, AV_LOG_ERROR, "invalid channel count. Speex must be mono or stereo.\n");
+ return AVERROR_INVALIDDATA;
+ }
+ st->codecpar->channel_layout = st->codecpar->channels == 1 ? AV_CH_LAYOUT_MONO :
+ AV_CH_LAYOUT_STEREO;
+
+ spxp->packet_size = AV_RL32(p + 56);
+ frames_per_packet = AV_RL32(p + 64);
if (frames_per_packet)
- st->codec->frame_size *= frames_per_packet;
+ spxp->packet_size *= frames_per_packet;
- st->codec->extradata_size = os->psize;
- st->codec->extradata = av_malloc(st->codec->extradata_size
- + FF_INPUT_BUFFER_PADDING_SIZE);
- memcpy(st->codec->extradata, p, st->codec->extradata_size);
+ st->codecpar->extradata_size = os->psize;
+ st->codecpar->extradata = av_malloc(st->codecpar->extradata_size
+ + AV_INPUT_BUFFER_PADDING_SIZE);
+ memcpy(st->codecpar->extradata, p, st->codecpar->extradata_size);
- st->time_base.num = 1;
- st->time_base.den = st->codec->sample_rate;
+ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
} else
- vorbis_comment(s, p, os->psize);
+ ff_vorbis_stream_comment(s, st, p, os->psize);
+ spxp->seq++;
return 1;
}
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
struct speex_params *spxp = os->private;
- int packet_size = s->streams[idx]->codec->frame_size;
-
- if (!spxp) {
- spxp = av_mallocz(sizeof(*spxp));
- os->private = spxp;
- }
+ int packet_size = spxp->packet_size;
- if (os->flags & OGG_FLAG_EOS && os->lastgp != -1 && os->granule > 0) {
+ if (os->flags & OGG_FLAG_EOS && os->lastpts != AV_NOPTS_VALUE &&
+ os->granule > 0) {
/* first packet of final page. we have to calculate the final packet
duration here because it is the only place we know the next-to-last
granule position. */
- spxp->final_packet_duration = os->granule - os->lastgp -
+ spxp->final_packet_duration = os->granule - os->lastpts -
packet_size * (ogg_page_packets(os) - 1);
}
- if (!os->lastgp && os->granule > 0)
+ if (!os->lastpts && os->granule > 0)
/* first packet */
- os->pduration = os->granule - packet_size * (ogg_page_packets(os) - 1);
- else if (os->flags & OGG_FLAG_EOS && os->segp == os->nsegs &&
- spxp->final_packet_duration)
+ os->lastpts = os->lastdts = os->granule - packet_size *
+ ogg_page_packets(os);
+ if (os->flags & OGG_FLAG_EOS && os->segp == os->nsegs &&
+ spxp->final_packet_duration)
/* final packet */
os->pduration = spxp->final_packet_duration;
else
.magic = "Speex ",
.magicsize = 8,
.header = speex_header,
- .packet = speex_packet
+ .packet = speex_packet,
+ .nb_header = 2,
};