**/
#include <stdlib.h>
+
+#include "libavutil/intreadwrite.h"
+
+#include "libavcodec/bytestream.h"
+
#include "avformat.h"
-#include "bitstream.h"
-#include "bswap.h"
-#include "ogg2.h"
-#include "avi.h"
+#include "internal.h"
+#include "oggdec.h"
+#include "riff.h"
static int
ogm_header(AVFormatContext *s, int idx)
{
- ogg_t *ogg = s->priv_data;
- ogg_stream_t *os = ogg->streams + idx;
+ struct ogg *ogg = s->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
AVStream *st = s->streams[idx];
- uint8_t *p = os->buf + os->pstart;
+ GetByteContext p;
uint64_t time_unit;
uint64_t spu;
- uint32_t default_len;
- if(!(*p & 1))
+ bytestream2_init(&p, os->buf + os->pstart, os->psize);
+ if (!(bytestream2_peek_byte(&p) & 1))
return 0;
- if(*p != 1)
- return 1;
- p++;
-
- if(*p == 'v'){
- int tag;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- p += 8;
- tag = le2me_32(unaligned32(p));
- st->codec->codec_id = codec_get_bmp_id(tag);
- st->codec->codec_tag = tag;
- } else {
- int cid;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- p += 8;
- p[4] = 0;
- cid = strtol(p, NULL, 16);
- st->codec->codec_id = codec_get_wav_id(cid);
- }
-
- p += 4;
- p += 4; /* useless size field */
-
- time_unit = le2me_64(unaligned64(p));
- p += 8;
- spu = le2me_64(unaligned64(p));
- p += 8;
- default_len = le2me_32(unaligned32(p));
- p += 4;
-
- p += 8; /* buffersize + bits_per_sample */
-
- if(st->codec->codec_type == CODEC_TYPE_VIDEO){
- st->codec->width = le2me_32(unaligned32(p));
- p += 4;
- st->codec->height = le2me_32(unaligned32(p));
- st->codec->time_base.den = spu * 10000000;
- st->codec->time_base.num = time_unit;
- st->time_base = st->codec->time_base;
- } else {
- st->codec->channels = le2me_16(unaligned16(p));
- p += 2;
- p += 2; /* block_align */
- st->codec->bit_rate = le2me_32(unaligned32(p)) * 8;
- st->codec->sample_rate = spu * 10000000 / time_unit;
- st->time_base.num = 1;
- st->time_base.den = st->codec->sample_rate;
+ if (bytestream2_peek_byte(&p) == 1) {
+ bytestream2_skip(&p, 1);
+
+ if (bytestream2_peek_byte(&p) == 'v'){
+ int tag;
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ bytestream2_skip(&p, 8);
+ tag = bytestream2_get_le32(&p);
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
+ st->codecpar->codec_tag = tag;
+ } else if (bytestream2_peek_byte(&p) == 't') {
+ st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ st->codecpar->codec_id = AV_CODEC_ID_TEXT;
+ bytestream2_skip(&p, 12);
+ } else {
+ uint8_t acid[5] = { 0 };
+ int cid;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ bytestream2_skip(&p, 8);
+ bytestream2_get_buffer(&p, acid, 4);
+ acid[4] = 0;
+ cid = strtol(acid, NULL, 16);
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid);
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+ }
+
+ bytestream2_skip(&p, 4); /* useless size field */
+
+ time_unit = bytestream2_get_le64(&p);
+ spu = bytestream2_get_le64(&p);
+ if (!time_unit || !spu) {
+ av_log(s, AV_LOG_ERROR, "Invalid timing values.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ bytestream2_skip(&p, 4); /* default_len */
+ bytestream2_skip(&p, 8); /* buffersize + bits_per_sample */
+
+ if(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
+ st->codecpar->width = bytestream2_get_le32(&p);
+ st->codecpar->height = bytestream2_get_le32(&p);
+ avpriv_set_pts_info(st, 64, time_unit, spu * 10000000);
+ } else {
+ st->codecpar->channels = bytestream2_get_le16(&p);
+ bytestream2_skip(&p, 2); /* block_align */
+ st->codecpar->bit_rate = bytestream2_get_le32(&p) * 8;
+ st->codecpar->sample_rate = spu * 10000000 / time_unit;
+ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+ }
+ } else if (bytestream2_peek_byte(&p) == 3) {
+ bytestream2_skip(&p, 7);
+ if (bytestream2_get_bytes_left(&p) > 1)
+ ff_vorbis_stream_comment(s, st, p.buffer, bytestream2_get_bytes_left(&p) - 1);
}
return 1;
static int
ogm_dshow_header(AVFormatContext *s, int idx)
{
- ogg_t *ogg = s->priv_data;
- ogg_stream_t *os = ogg->streams + idx;
+ struct ogg *ogg = s->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
AVStream *st = s->streams[idx];
uint8_t *p = os->buf + os->pstart;
uint32_t t;
if(*p != 1)
return 1;
- t = le2me_32(unaligned32(p + 96));
+ t = AV_RL32(p + 96);
if(t == 0x05589f80){
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- st->codec->codec_id = codec_get_bmp_id(le2me_32(unaligned32(p + 68)));
- st->codec->time_base.den = 10000000;
- st->codec->time_base.num = le2me_64(unaligned64(p + 164));
- st->codec->width = le2me_32(unaligned32(p + 176));
- st->codec->height = le2me_32(unaligned32(p + 180));
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
+ avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000);
+ st->codecpar->width = AV_RL32(p + 176);
+ st->codecpar->height = AV_RL32(p + 180);
} else if(t == 0x05589f81){
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->codec_id = codec_get_wav_id(le2me_16(unaligned16(p+124)));
- st->codec->channels = le2me_16(unaligned16(p + 126));
- st->codec->sample_rate = le2me_32(unaligned32(p + 128));
- st->codec->bit_rate = le2me_32(unaligned32(p + 132)) * 8;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124));
+ st->codecpar->channels = AV_RL16(p + 126);
+ st->codecpar->sample_rate = AV_RL32(p + 128);
+ st->codecpar->bit_rate = AV_RL32(p + 132) * 8;
}
return 1;
static int
ogm_packet(AVFormatContext *s, int idx)
{
- ogg_t *ogg = s->priv_data;
- ogg_stream_t *os = ogg->streams + idx;
+ struct ogg *ogg = s->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
uint8_t *p = os->buf + os->pstart;
int lb;
+ if(*p & 8)
+ os->pflags |= AV_PKT_FLAG_KEY;
+
lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
os->pstart += lb + 1;
os->psize -= lb + 1;
+ while (lb--)
+ os->pduration += p[lb+1] << (lb*8);
+
return 0;
}
-ogg_codec_t ogm_video_codec = {
+const struct ogg_codec ff_ogm_video_codec = {
.magic = "\001video",
.magicsize = 6,
.header = ogm_header,
- .packet = ogm_packet
+ .packet = ogm_packet,
+ .granule_is_start = 1,
+ .nb_header = 2,
};
-ogg_codec_t ogm_audio_codec = {
+const struct ogg_codec ff_ogm_audio_codec = {
.magic = "\001audio",
.magicsize = 6,
.header = ogm_header,
- .packet = ogm_packet
+ .packet = ogm_packet,
+ .granule_is_start = 1,
+ .nb_header = 2,
+};
+
+const struct ogg_codec ff_ogm_text_codec = {
+ .magic = "\001text",
+ .magicsize = 5,
+ .header = ogm_header,
+ .packet = ogm_packet,
+ .granule_is_start = 1,
+ .nb_header = 2,
};
-ogg_codec_t ogm_old_codec = {
+const struct ogg_codec ff_ogm_old_codec = {
.magic = "\001Direct Show Samples embedded in Ogg",
.magicsize = 35,
.header = ogm_dshow_header,
- .packet = ogm_packet
+ .packet = ogm_packet,
+ .granule_is_start = 1,
+ .nb_header = 1,
};
projects / ffmpeg / blobdiff