* modules/packetizer/copy.c, modules/stream_out/transcode.c: handle raw RV15, RV16...

GREY.

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index f238a1dbbe4f9f8199f46b98793d42ff50f3bfc4..4e9a0194a68570ae982fb12ec97c9b2a75b701c4 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -2,7 +2,7 @@
  * copy.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: copy.c,v 1.10 2003/05/16 23:02:37 gbazin Exp $
+ * $Id: copy.c,v 1.11 2003/07/20 23:30:07 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -257,6 +257,26 @@ static int InitThread( packetizer_thread_t *p_pack )
             p_pack->output_format.i_fourcc = VLC_FOURCC( 'I', '4', '2', '2' );
             p_pack->output_format.i_cat = VIDEO_ES;
             break;
+        case VLC_FOURCC( 'R', 'V', '1', '5' ):
+            p_pack->output_format.i_fourcc = VLC_FOURCC( 'R', 'V', '1', '5' );
+            p_pack->output_format.i_cat = VIDEO_ES;
+            break;
+        case VLC_FOURCC( 'R', 'V', '1', '6' ):
+            p_pack->output_format.i_fourcc = VLC_FOURCC( 'R', 'V', '1', '6' );
+            p_pack->output_format.i_cat = VIDEO_ES;
+            break;
+        case VLC_FOURCC( 'R', 'V', '2', '4' ):
+            p_pack->output_format.i_fourcc = VLC_FOURCC( 'R', 'V', '2', '4' );
+            p_pack->output_format.i_cat = VIDEO_ES;
+            break;
+        case VLC_FOURCC( 'R', 'V', '3', '2' ):
+            p_pack->output_format.i_fourcc = VLC_FOURCC( 'R', 'V', '3', '2' );
+            p_pack->output_format.i_cat = VIDEO_ES;
+            break;
+        case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
+            p_pack->output_format.i_fourcc = VLC_FOURCC( 'G', 'R', 'E', 'Y' );
+            p_pack->output_format.i_cat = VIDEO_ES;
+            break;
 
         /* audio */
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index bbe0d99662d6288b31b8821f8f2e0c09bfd33e32..3ab64ef02dc04c820752a6e7c85f593689b0485e 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2,7 +2,7 @@
  * transcode.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: transcode.c,v 1.25 2003/07/13 13:18:25 gbazin Exp $
+ * $Id: transcode.c,v 1.26 2003/07/20 23:30:07 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -513,7 +513,10 @@ static struct
     { VLC_FOURCC( 'I', '4', '2', '0' ), CODEC_ID_RAWVIDEO },
     { VLC_FOURCC( 'I', '4', '2', '2' ), CODEC_ID_RAWVIDEO },
     { VLC_FOURCC( 'I', '4', '4', '4' ), CODEC_ID_RAWVIDEO },
+    { VLC_FOURCC( 'R', 'V', '1', '5' ), CODEC_ID_RAWVIDEO },
+    { VLC_FOURCC( 'R', 'V', '1', '6' ), CODEC_ID_RAWVIDEO },
     { VLC_FOURCC( 'R', 'V', '2', '4' ), CODEC_ID_RAWVIDEO },
+    { VLC_FOURCC( 'R', 'V', '3', '2' ), CODEC_ID_RAWVIDEO },
     { VLC_FOURCC( 'Y', 'U', 'Y', '2' ), CODEC_ID_RAWVIDEO },
 
     { VLC_FOURCC(   0,   0,   0,   0 ), 0 }
@@ -544,8 +547,16 @@ static inline int get_ff_chroma( vlc_fourcc_t i_chroma )
             return PIX_FMT_YUV422P;
         case VLC_FOURCC( 'I', '4', '4', '4' ):
             return PIX_FMT_YUV444P;
+        case VLC_FOURCC( 'R', 'V', '1', '5' ):
+            return PIX_FMT_RGB555;
+        case VLC_FOURCC( 'R', 'V', '1', '6' ):
+            return PIX_FMT_RGB565;
         case VLC_FOURCC( 'R', 'V', '2', '4' ):
             return PIX_FMT_RGB24;
+        case VLC_FOURCC( 'R', 'V', '3', '2' ):
+            return PIX_FMT_RGBA32;
+        case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
+            return PIX_FMT_GRAY8;
         case VLC_FOURCC( 'Y', 'U', 'Y', '2' ):
             return PIX_FMT_YUV422;
         default:
@@ -1063,7 +1074,11 @@ static int transcode_video_ffmpeg_new( sout_stream_t *p_stream,
         id->f_src.i_fourcc == VLC_FOURCC( 'I', '4', '2', '2' ) ||
         id->f_src.i_fourcc == VLC_FOURCC( 'I', '4', '4', '4' ) ||
         id->f_src.i_fourcc == VLC_FOURCC( 'Y', 'U', 'Y', '2' ) ||
-        id->f_src.i_fourcc == VLC_FOURCC( 'R', 'V', '2', '4' ) )
+        id->f_src.i_fourcc == VLC_FOURCC( 'R', 'V', '1', '5' ) ||
+        id->f_src.i_fourcc == VLC_FOURCC( 'R', 'V', '1', '6' ) ||
+        id->f_src.i_fourcc == VLC_FOURCC( 'R', 'V', '2', '4' ) ||
+        id->f_src.i_fourcc == VLC_FOURCC( 'R', 'V', '3', '2' ) ||
+        id->f_src.i_fourcc == VLC_FOURCC( 'G', 'R', 'E', 'Y' ) )
     {
         id->ff_dec   = NULL;
         id->ff_dec_c            = avcodec_alloc_context();