RoQ muxer, patch by Vitor, vitor1001 gmail com

reference thread:
Subject: [FFmpeg-devel] [PATCH] RoQ muxer
Date: Wed, 09 May 2007 19:44:21 +0200

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8959 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 8269aabdf738062d20cb2201799ee3d555efcab1..f70b8b8f1027b8a77134269374f6f5315348c373 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -894,7 +894,7 @@ library:
 @item 4xm              @tab    @tab X
 @tab 4X Technologies format, used in some games.
 @item Playstation STR  @tab    @tab X
-@item Id RoQ           @tab    @tab X
+@item Id RoQ           @tab X  @tab X
 @tab Used in Quake III, Jedi Knight 2, other computer games.
 @item Interplay MVE    @tab    @tab X
 @tab Format used in various Interplay computer games.

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 256bd9e4e29c3d32080bfa83903867dd455664ac..009d1635bc88f1ee2ffd2235395b6900951281e4 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -116,6 +116,7 @@ OBJS-$(CONFIG_REDIR_DEMUXER)             += rtsp.o
 OBJS-$(CONFIG_RM_DEMUXER)                += rm.o
 OBJS-$(CONFIG_RM_MUXER)                  += rm.o
 OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.o
+OBJS-$(CONFIG_ROQ_MUXER)                 += raw.o
 OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o rtp_h264.o
 OBJS-$(CONFIG_RTSP_DEMUXER)              += rtsp.o
 OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 276e4aca71ad839c80f8c75a5bd838bf36bf0c44..84ba0671ef213b99cd6a0aff291ae5fffd31a547 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -131,7 +131,7 @@ void av_register_all(void)
     REGISTER_MUXER   (PSP, psp);
     REGISTER_MUXDEMUX(RAWVIDEO, rawvideo);
     REGISTER_MUXDEMUX(RM, rm);
-    REGISTER_DEMUXER (ROQ, roq);
+    REGISTER_MUXDEMUX(ROQ, roq);
     REGISTER_DEMUXER (REDIR, redir);
     REGISTER_MUXER   (RTP, rtp);
     REGISTER_DEMUXER (RTSP, rtsp);

diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 698941e480f38832581060a5981e38bd7aaa4792..4c9a9040677c32908a451c315b210ad4922f005b 100644 (file)
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -169,6 +169,7 @@ extern AVOutputFormat pcm_u8_muxer;
 extern AVOutputFormat psp_muxer;
 extern AVOutputFormat rawvideo_muxer;
 extern AVOutputFormat rm_muxer;
+extern AVOutputFormat roq_muxer;
 extern AVOutputFormat swf_muxer;
 extern AVOutputFormat tg2_muxer;
 extern AVOutputFormat tgp_muxer;

diff --git a/libavformat/raw.c b/libavformat/raw.c
index 9f12e551d8fc910928b583bdde4dab841e99e0e3..cdacfa81f124be748f232a326ee1acc17b457386 100644 (file)
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -43,6 +43,19 @@ static int flac_write_header(struct AVFormatContext *s)
     return 0;
 }
 
+
+static int roq_write_header(struct AVFormatContext *s)
+{
+    static const uint8_t header[] = {
+        0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
+    };
+
+    put_buffer(&s->pb, header, 8);
+    put_flush_packet(&s->pb);
+
+    return 0;
+}
+
 static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
     put_buffer(&s->pb, pkt->data, pkt->size);
@@ -527,6 +540,22 @@ AVInputFormat aac_demuxer = {
     .extensions = "aac",
 };
 
+#ifdef CONFIG_ROQ_MUXER
+AVOutputFormat roq_muxer =
+{
+    "RoQ",
+    "Id RoQ format",
+    NULL,
+    "roq",
+    0,
+    CODEC_ID_ROQ_DPCM,
+    CODEC_ID_ROQ,
+    roq_write_header,
+    raw_write_packet,
+    raw_write_trailer,
+};
+#endif //CONFIG_ROQ_MUXER
+
 AVInputFormat h261_demuxer = {
     "h261",
     "raw h261",