diff options
Diffstat (limited to 'contrib/ffmpeg/libavformat/oggparseogm.c')
| -rw-r--r-- | contrib/ffmpeg/libavformat/oggparseogm.c | 71 |
1 files changed, 41 insertions, 30 deletions
diff --git a/contrib/ffmpeg/libavformat/oggparseogm.c b/contrib/ffmpeg/libavformat/oggparseogm.c index 8788e5d41..70e53948f 100644 --- a/contrib/ffmpeg/libavformat/oggparseogm.c +++ b/contrib/ffmpeg/libavformat/oggparseogm.c @@ -25,8 +25,9 @@ #include <stdlib.h> #include "avformat.h" #include "bitstream.h" -#include "bswap.h" -#include "ogg2.h" +#include "bytestream.h" +#include "intreadwrite.h" +#include "oggdec.h" #include "riff.h" static int @@ -35,7 +36,7 @@ ogm_header(AVFormatContext *s, int idx) ogg_t *ogg = s->priv_data; ogg_stream_t *os = ogg->streams + idx; AVStream *st = s->streams[idx]; - uint8_t *p = os->buf + os->pstart; + const uint8_t *p = os->buf + os->pstart; uint64_t time_unit; uint64_t spu; uint32_t default_len; @@ -51,42 +52,42 @@ ogm_header(AVFormatContext *s, int idx) 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); + tag = bytestream_get_le32(&p); + st->codec->codec_id = codec_get_id(codec_bmp_tags, tag); st->codec->codec_tag = tag; + } else if (*p == 't') { + st->codec->codec_type = CODEC_TYPE_SUBTITLE; + st->codec->codec_id = CODEC_ID_TEXT; + p += 12; } else { + uint8_t acid[5]; 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); + bytestream_get_buffer(&p, acid, 4); + acid[4] = 0; + cid = strtol(acid, NULL, 16); + st->codec->codec_id = codec_get_id(codec_wav_tags, 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; + time_unit = bytestream_get_le64(&p); + spu = bytestream_get_le64(&p); + default_len = bytestream_get_le32(&p); 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->width = bytestream_get_le32(&p); + st->codec->height = bytestream_get_le32(&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; + st->codec->channels = bytestream_get_le16(&p); p += 2; /* block_align */ - st->codec->bit_rate = le2me_32(unaligned32(p)) * 8; + st->codec->bit_rate = bytestream_get_le32(&p) * 8; st->codec->sample_rate = spu * 10000000 / time_unit; st->time_base.num = 1; st->time_base.den = st->codec->sample_rate; @@ -109,21 +110,21 @@ ogm_dshow_header(AVFormatContext *s, int idx) 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->codec_id = codec_get_id(codec_bmp_tags, AV_RL32(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->codec->time_base.num = AV_RL64(p + 164); + st->codec->width = AV_RL32(p + 176); + st->codec->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->codec->codec_id = codec_get_id(codec_wav_tags, AV_RL16(p + 124)); + st->codec->channels = AV_RL16(p + 126); + st->codec->sample_rate = AV_RL32(p + 128); + st->codec->bit_rate = AV_RL32(p + 132) * 8; } return 1; @@ -137,6 +138,9 @@ ogm_packet(AVFormatContext *s, int idx) uint8_t *p = os->buf + os->pstart; int lb; + if(*p & 8) + os->pflags |= PKT_FLAG_KEY; + lb = ((*p & 2) << 1) | ((*p >> 6) & 3); os->pstart += lb + 1; os->psize -= lb + 1; @@ -158,6 +162,13 @@ ogg_codec_t ogm_audio_codec = { .packet = ogm_packet }; +ogg_codec_t ogm_text_codec = { + .magic = "\001text", + .magicsize = 5, + .header = ogm_header, + .packet = ogm_packet +}; + ogg_codec_t ogm_old_codec = { .magic = "\001Direct Show Samples embedded in Ogg", .magicsize = 35, |