[Mplayer-cvslog] CVS: main roqav.c,NONE,1.1 roqav.h,NONE,1.1 Makefile,1.146,1.147 codec-cfg.h,1.38,1.39 codec-cfg.c,1.64,1.65

[Mike Melanson]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv17223

Modified Files:
	Makefile codec-cfg.h codec-cfg.c 
Added Files:
	roqav.c roqav.h 
Log Message:
added skeleton decoders for RoQ audio and video format decoders


--- NEW FILE ---
/*
        RoQ A/V decoder for the MPlayer program
        by Mike Melanson
        based on Dr. Tim Ferguson's RoQ document found at:
          http://www.csse.monash.edu.au/~timf/videocodec.html
*/

#include "config.h"
#include "bswap.h"
#include <stdio.h>

#define LE_16(x) (le2me_16(*(unsigned short *)(x)))
#define LE_32(x) (le2me_32(*(unsigned int *)(x)))

void *roq_decode_video_init(void)
{
}

void roq_decode_video(
  unsigned char *encoded,
  int encoded_size,
  unsigned char *decoded,
  int width,
  int height,
  void *context)
{
}

void *roq_decode_audio_init(void)
{
}

int roq_decode_audio(
  unsigned short *output,
  unsigned char *input,
  int channels,
  void *context)
{
}

--- NEW FILE ---
#ifndef ROQAV_H
#define ROQAV_H

void *roq_decode_video_init(void);
void roq_decode_video(unsigned char *encoded, int encoded_size,
  unsigned char *decoded, int width, int height, void *context);

void *roq_decode_audio_init(void);
int roq_decode_audio(unsigned short *output, unsigned char *input,
  int channels, void *context);

#endif // ROQAV_H

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- Makefile	30 Jan 2002 12:46:03 -0000	1.146
+++ Makefile	1 Feb 2002 05:33:40 -0000	1.147
@@ -27,7 +27,7 @@
 # a BSD compatible 'install' program
 INSTALL = install
 
-SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c
+SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c
 SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c
 SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c
 

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- codec-cfg.h	22 Jan 2002 05:39:26 -0000	1.38
+++ codec-cfg.h	1 Feb 2002 05:33:40 -0000	1.39
@@ -36,6 +36,7 @@
 #define AFM_IMAADPCM 16
 #define AFM_FOX61ADPCM 17
 #define AFM_FOX62ADPCM 18
+#define AFM_ROQAUDIO 19
 
 #define VFM_MPEG 1
 #define VFM_VFW 2
@@ -55,6 +56,7 @@
 #define VFM_CYUV 16
 #define VFM_QTSMC 17
 #define VFM_DUCKTM1 18
+#define VFM_ROQVIDEO 19
 
 #ifndef GUID_TYPE
 #define GUID_TYPE

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- codec-cfg.c	22 Jan 2002 05:39:26 -0000	1.64
+++ codec-cfg.c	1 Feb 2002 05:33:40 -0000	1.65
@@ -221,6 +221,7 @@
 		"imaadpcm",
 		"fox61adpcm",
 		"fox62adpcm",
+		"roqaudio",
 		NULL
 	};
 	static char *videodrv[] = {
@@ -243,6 +244,7 @@
 		"cyuv",
 		"qtsmc",
 		"ducktm1",
+		"roqvideo",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;