Mercurial > libavformat.hg
changeset 1076:a1c07ce3943c libavformat
ogm demuxing
| author | mru |
|---|---|
| date | Thu, 11 May 2006 23:07:22 +0000 |
| parents | f125be9d18e2 |
| children | 91677ac6fb19 |
| files | Makefile ogg2.c ogg2.h oggparseogm.c |
| diffstat | 4 files changed, 165 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu May 11 21:29:37 2006 +0000 +++ b/Makefile Thu May 11 23:07:22 2006 +0000 @@ -18,7 +18,7 @@ nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \ sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \ ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o aiff.o \ - voc.o tta.o mm.o avs.o smacker.o nuv.o + voc.o tta.o mm.o avs.o smacker.o nuv.o oggparseogm.o # muxers ifeq ($(CONFIG_MUXERS),yes)
--- a/ogg2.c Thu May 11 21:29:37 2006 +0000 +++ b/ogg2.c Thu May 11 23:07:22 2006 +0000 @@ -41,6 +41,9 @@ &vorbis_codec, &theora_codec, &flac_codec, + &ogm_video_codec, + &ogm_audio_codec, + &ogm_old_codec, NULL };
--- a/ogg2.h Thu May 11 21:29:37 2006 +0000 +++ b/ogg2.h Thu May 11 23:07:22 2006 +0000 @@ -76,11 +76,9 @@ extern ogg_codec_t vorbis_codec; extern ogg_codec_t theora_codec; extern ogg_codec_t flac_codec; -#if 0 extern ogg_codec_t ogm_video_codec; extern ogg_codec_t ogm_audio_codec; extern ogg_codec_t ogm_old_codec; -#endif extern int vorbis_comment(AVFormatContext *ms, char *buf, int size);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/oggparseogm.c Thu May 11 23:07:22 2006 +0000 @@ -0,0 +1,161 @@ +/** + Copyright (C) 2005 Michael Ahlberg, Måns Rullgård + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +**/ + +#include <stdlib.h> +#include "avformat.h" +#include "bitstream.h" +#include "bswap.h" +#include "ogg2.h" +#include "avi.h" + +static int +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; + uint64_t time_unit; + uint64_t spu; + uint32_t default_len; + + if(!(*p & 1)) + return 0; + if(*p != 1) + return 1; + + p++; + + if(*p == 'v'){ + st->codec->codec_type = CODEC_TYPE_VIDEO; + p += 8; + st->codec->codec_id = codec_get_bmp_id(le2me_32(unaligned32(p))); + } 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; + } + + return 1; +} + +static int +ogm_dshow_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; + uint32_t t; + + if(!(*p & 1)) + return 0; + if(*p != 1) + return 1; + + t = le2me_32(unaligned32(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)); + } 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; + } + + return 1; +} + +static int +ogm_packet(AVFormatContext *s, int idx) +{ + ogg_t *ogg = s->priv_data; + ogg_stream_t *os = ogg->streams + idx; + uint8_t *p = os->buf + os->pstart; + int lb; + + lb = ((*p & 2) << 1) | ((*p >> 6) & 3); + os->pstart += lb + 1; + os->psize -= lb + 1; + + return 0; +} + +ogg_codec_t ogm_video_codec = { + .magic = "\001video", + .magicsize = 6, + .header = ogm_header, + .packet = ogm_packet +}; + +ogg_codec_t ogm_audio_codec = { + .magic = "\001audio", + .magicsize = 6, + .header = ogm_header, + .packet = ogm_packet +}; + +ogg_codec_t ogm_old_codec = { + .magic = "\001Direct Show Samples embedded in Ogg", + .magicsize = 35, + .header = ogm_dshow_header, + .packet = ogm_packet +};