[Ffmpeg-cvslog] r8587 - in trunk: Changelog doc/ffmpeg-doc.texi libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/mjpeg.c libavformat/Makefile libavformat/allformats.c libavformat/allformats.h libavformat/thp.c
diego
subversion
Sun Apr 1 16:28:48 CEST 2007
Author: diego
Date: Sun Apr 1 16:28:48 2007
New Revision: 8587
Added:
trunk/libavformat/thp.c
Modified:
trunk/Changelog
trunk/doc/ffmpeg-doc.texi
trunk/libavcodec/allcodecs.c
trunk/libavcodec/avcodec.h
trunk/libavcodec/mjpeg.c
trunk/libavformat/Makefile
trunk/libavformat/allformats.c
trunk/libavformat/allformats.h
Log:
support for the THP game format by Marco Gerards, mgerards xs4all nl
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog (original)
+++ trunk/Changelog Sun Apr 1 16:28:48 2007
@@ -75,6 +75,7 @@ version <next>
- DCA decoder
- DXA demuxer and decoder
- DNxHD decoder
+- Gamecube movie (.THP) playback system
version 0.4.9-pre1:
Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi (original)
+++ trunk/doc/ffmpeg-doc.texi Sun Apr 1 16:28:48 2007
@@ -901,6 +901,8 @@ library:
@item DXA @tab @tab X
@tab This format is used in non-Windows version of Feeble Files game and
different game cutscenes repacked for use with ScummVM.
+ at item THP @tab @tab X
+ at tab Used on the Nintendo GameCube (video only)
@end multitable
@code{X} means that encoding (resp. decoding) is supported.
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c (original)
+++ trunk/libavcodec/allcodecs.c Sun Apr 1 16:28:48 2007
@@ -130,6 +130,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(SVQ3, svq3);
REGISTER_ENCDEC (TARGA, targa);
REGISTER_DECODER(THEORA, theora);
+ REGISTER_DECODER(THP, thp);
REGISTER_DECODER(TIERTEXSEQVIDEO, tiertexseqvideo);
REGISTER_DECODER(TIFF, tiff);
REGISTER_DECODER(TRUEMOTION1, truemotion1);
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h (original)
+++ trunk/libavcodec/avcodec.h Sun Apr 1 16:28:48 2007
@@ -158,6 +158,7 @@ enum CodecID {
CODEC_ID_FFH264,
CODEC_ID_DXA,
CODEC_ID_DNXHD,
+ CODEC_ID_THP,
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
@@ -2329,6 +2330,7 @@ extern AVCodec svq1_decoder;
extern AVCodec svq3_decoder;
extern AVCodec targa_decoder;
extern AVCodec theora_decoder;
+extern AVCodec thp_decoder;
extern AVCodec tiertexseqvideo_decoder;
extern AVCodec tiff_decoder;
extern AVCodec truemotion1_decoder;
Modified: trunk/libavcodec/mjpeg.c
==============================================================================
--- trunk/libavcodec/mjpeg.c (original)
+++ trunk/libavcodec/mjpeg.c Sun Apr 1 16:28:48 2007
@@ -2044,6 +2044,8 @@ static int mjpeg_decode_frame(AVCodecCon
uint8_t x = *(src++);
*(dst++) = x;
+ if (avctx->codec_id != CODEC_ID_THP)
+ {
if (x == 0xff)
{
while(src<buf_end && x == 0xff)
@@ -2054,6 +2056,7 @@ static int mjpeg_decode_frame(AVCodecCon
else if (x)
break;
}
+ }
}
init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8);
@@ -2583,6 +2586,19 @@ AVCodec mjpeg_decoder = {
NULL
};
+AVCodec thp_decoder = {
+ "thp",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_THP,
+ sizeof(MJpegDecodeContext),
+ mjpeg_decode_init,
+ NULL,
+ mjpeg_decode_end,
+ mjpeg_decode_frame,
+ CODEC_CAP_DR1,
+ NULL
+};
+
AVCodec mjpegb_decoder = {
"mjpegb",
CODEC_TYPE_VIDEO,
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile (original)
+++ trunk/libavformat/Makefile Sun Apr 1 16:28:48 2007
@@ -120,6 +120,7 @@ OBJS-$(CONFIG_SMACKER_DEMUXER)
OBJS-$(CONFIG_SOL_DEMUXER) += sol.o
OBJS-$(CONFIG_SWF_DEMUXER) += swf.o
OBJS-$(CONFIG_SWF_MUXER) += swf.o
+OBJS-$(CONFIG_THP_DEMUXER) += thp.o
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
OBJS-$(CONFIG_TTA_DEMUXER) += tta.o
OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c (original)
+++ trunk/libavformat/allformats.c Sun Apr 1 16:28:48 2007
@@ -142,6 +142,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX(SWF, swf);
REGISTER_MUXER (TG2, tg2);
REGISTER_MUXER (TGP, tgp);
+ REGISTER_DEMUXER (THP, thp);
REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq);
REGISTER_DEMUXER (TTA, tta);
REGISTER_DEMUXER (V4L2, v4l2);
Modified: trunk/libavformat/allformats.h
==============================================================================
--- trunk/libavformat/allformats.h (original)
+++ trunk/libavformat/allformats.h Sun Apr 1 16:28:48 2007
@@ -168,6 +168,7 @@ extern AVOutputFormat yuv4mpegpipe_muxer
extern AVInputFormat yuv4mpegpipe_demuxer;
extern AVInputFormat tiertexseq_demuxer;
extern AVInputFormat x11_grab_device_demuxer;
+extern AVInputFormat thp_demuxer;
/* raw.c */
int pcm_read_seek(AVFormatContext *s,
Added: trunk/libavformat/thp.c
==============================================================================
--- (empty file)
+++ trunk/libavformat/thp.c Sun Apr 1 16:28:48 2007
@@ -0,0 +1,170 @@
+/*
+ * THP Demuxer
+ * Copyright (c) 2007 Marco Gerards.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#include "avformat.h"
+#include "allformats.h"
+
+typedef struct ThpDemuxContext {
+ int version;
+ int first_frame;
+ int first_framesz;
+ int last_frame;
+ int compoff;
+ int framecnt;
+ AVRational fps;
+ int frame;
+ int next_frame;
+ int next_framesz;
+ int video_stream_index;
+ int compcount;
+ unsigned char components[16];
+ AVStream* vst;
+ int has_audio;
+} ThpDemuxContext;
+
+
+static int thp_probe(AVProbeData *p)
+{
+ /* check file header */
+ if (p->buf_size < 4)
+ return 0;
+
+ if (AV_RL32(p->buf) == MKTAG('T', 'H', 'P', '\0'))
+ return AVPROBE_SCORE_MAX;
+ else
+ return 0;
+}
+
+static int thp_read_header(AVFormatContext *s,
+ AVFormatParameters *ap)
+{
+ ThpDemuxContext *thp = s->priv_data;
+ AVStream *st;
+ ByteIOContext *pb = &s->pb;
+ int i;
+
+ /* Read the file header. */
+
+ get_be32(pb); /* Skip Magic. */
+ thp->version = get_be32(pb);
+
+ get_be32(pb); /* Max buf size. */
+ get_be32(pb); /* Max samples. */
+
+ thp->fps = av_d2q(av_int2flt(get_be32(pb)), INT_MAX);
+ thp->framecnt = get_be32(pb);
+ thp->first_framesz = get_be32(pb);
+ get_be32(pb); /* Data size. */
+
+ thp->compoff = get_be32(pb);
+ get_be32(pb); /* offsetDataOffset. */
+ thp->first_frame = get_be32(pb);
+ thp->last_frame = get_be32(pb);
+
+ thp->next_framesz = thp->first_framesz;
+ thp->next_frame = thp->first_frame;
+
+ /* Read the component structure. */
+ url_fseek (pb, thp->compoff, SEEK_SET);
+ thp->compcount = get_be32(pb);
+
+ /* Read the list of component types. */
+ get_buffer(pb, thp->components, 16);
+
+ for (i = 0; i < thp->compcount; i++) {
+ if (thp->components[i] == 0) {
+ if (thp->vst != 0)
+ break;
+
+ /* Video component. */
+ st = av_new_stream(s, 0);
+ if (!st)
+ return AVERROR_NOMEM;
+
+ /* The denominator and numerator are switched because 1/fps
+ is required. */
+ av_set_pts_info(st, 64, thp->fps.den, thp->fps.num);
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_id = CODEC_ID_THP;
+ st->codec->codec_tag = 0; /* no fourcc */
+ st->codec->width = get_be32(pb);
+ st->codec->height = get_be32(pb);
+ st->codec->sample_rate = av_q2d(thp->fps);
+ thp->vst = st;
+ thp->video_stream_index = st->index;
+
+ if (thp->version == 0x11000)
+ get_be32(pb); /* Unknown. */
+ }
+ else if (thp->components[i] == 1) {
+ /* XXX: Required for audio playback. */
+ thp->has_audio = 1;
+ }
+ }
+
+ return 0;
+}
+
+static int thp_read_packet(AVFormatContext *s,
+ AVPacket *pkt)
+{
+ ThpDemuxContext *thp = s->priv_data;
+ ByteIOContext *pb = &s->pb;
+ int size;
+ int ret;
+
+ /* Terminate when last frame is reached. */
+ if (thp->frame >= thp->framecnt)
+ return AVERROR_IO;
+
+ url_fseek(pb, thp->next_frame, SEEK_SET);
+
+ /* Locate the next frame and read out its size. */
+ thp->next_frame += thp->next_framesz;
+ thp->next_framesz = get_be32(pb);
+
+ get_be32(pb); /* Previous total size. */
+ size = get_be32(pb); /* Total size of this frame. */
+
+ if (thp->has_audio)
+ get_be32(pb); /* Audio size. */
+
+ ret = av_get_packet(pb, pkt, size);
+ if (ret != size) {
+ av_free_packet(pkt);
+ return AVERROR_IO;
+ }
+
+ pkt->stream_index = thp->video_stream_index;
+ thp->frame++;
+
+ return 0;
+}
+
+AVInputFormat thp_demuxer = {
+ "thp",
+ "THP",
+ sizeof(ThpDemuxContext),
+ thp_probe,
+ thp_read_header,
+ thp_read_packet
+};
More information about the ffmpeg-cvslog
mailing list