Upgrade requirements for libavcodec and libavutil

[vlc] / modules / codec / avcodec / chroma.h

diff --git a/modules/codec/avcodec/chroma.h b/modules/codec/avcodec/chroma.h
index 2a7288a9faa4a393cb24fc774c6a5ffd1c959438..d7ef4eff61dbbbd082c85dad060d888b89085e9b 100644 (file)
--- a/modules/codec/avcodec/chroma.h
+++ b/modules/codec/avcodec/chroma.h
@@ -1,104 +1,35 @@
 /*****************************************************************************
- * chroma.h: libavutil <-> libvlc conversion routines
+ * chroma.h: decoder and encoder using libavcodec
  *****************************************************************************
- * Copyright (C) 1999-2008 the VideoLAN team
+ * Copyright (C) 2001-2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *          Gildas Bazin <gbazin@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program 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.
  *
  * This program 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * Chroma fourcc -> ffmpeg_id mapping
- *****************************************************************************/
-
-#define VLC_FF( fcc, fav ) \
-    { VLC_FOURCC fcc, fav }
-
-#if defined(WORDS_BIGENDIAN)
-#   define VLC_FF_RGB_DEFAULT( fcc, le, be ) VLC_FF( fcc, be )
-#else
-#   define VLC_FF_RGB_DEFAULT( fcc, le, be ) VLC_FF( fcc, le )
-#endif
-
-static const struct
-{
-    vlc_fourcc_t  i_chroma;
-    int  i_chroma_id;
-
-} chroma_table[] =
-{
-    /* Planar YUV formats */
-    VLC_FF( ('I','4','4','4'), PIX_FMT_YUV444P ),
-    VLC_FF( ('J','4','4','4'), PIX_FMT_YUVJ444P ),
+/* VLC <-> avutil tables */
 
-    VLC_FF( ('I','4','2','2'), PIX_FMT_YUV422P ),
-    VLC_FF( ('J','4','2','2'), PIX_FMT_YUVJ422P ),
+#ifndef _VLC_AVUTIL_CHROMA_H
+#define _VLC_AVUTIL_CHROMA_H 1
 
-    VLC_FF( ('I','4','2','0'), PIX_FMT_YUV420P ),
-    VLC_FF( ('Y','V','1','2'), PIX_FMT_YUV420P ),
-    VLC_FF( ('I','Y','U','V'), PIX_FMT_YUV420P ),
-    VLC_FF( ('J','4','2','0'), PIX_FMT_YUVJ420P ),
-    VLC_FF( ('I','4','1','1'), PIX_FMT_YUV411P ),
-    VLC_FF( ('I','4','1','0'), PIX_FMT_YUV410P ),
-    VLC_FF( ('Y','V','U','9'), PIX_FMT_YUV410P ),
+int FindFfmpegChroma( vlc_fourcc_t );
+int GetFfmpegChroma( int *i_ffmpeg_chroma, const video_format_t *fmt );
 
-    /* Packed YUV formats */
-    VLC_FF( ('Y','U','Y','2'), PIX_FMT_YUV422 ),
-    VLC_FF( ('Y','U','Y','V'), PIX_FMT_YUV422 ),
-    VLC_FF( ('U','Y','V','Y'), PIX_FMT_UYVY422 ),
+vlc_fourcc_t FindVlcChroma( int );
+int GetVlcChroma( video_format_t *fmt, int i_ffmpeg_chroma );
 
-    /* Packed RGB formats */
-    VLC_FF_RGB_DEFAULT( ('R','G','B','8'), PIX_FMT_RGB8,    PIX_FMT_BGR8 ),
-    VLC_FF_RGB_DEFAULT( ('R','V','1','5'), PIX_FMT_RGB555,  PIX_FMT_BGR555 ),
-    VLC_FF_RGB_DEFAULT( ('R','V','1','6'), PIX_FMT_RGB565,  PIX_FMT_BGR565 ),
-    VLC_FF_RGB_DEFAULT( ('R','V','2','4'), PIX_FMT_RGB24,   PIX_FMT_BGR24 ),
-
-    VLC_FF( ('R','V','3','2'), PIX_FMT_RGBA32 ),    // FIXME is that wanted
-
-#if defined(PIX_FMT_RGBA)
-    VLC_FF( ('R','G','B','A'), PIX_FMT_RGBA ),
 #endif
-    VLC_FF( ('G','R','E','Y'), PIX_FMT_GRAY8 ),
-
-    { 0, 0 }
-};
-
-static inline int GetFfmpegChroma( vlc_fourcc_t i_chroma )
-{
-    int i;
-
-    for( i = 0; chroma_table[i].i_chroma != 0; i++ )
-    {
-        if( chroma_table[i].i_chroma == i_chroma )
-            return chroma_table[i].i_chroma_id;
-    }
-    return -1;
-}
-
-static inline vlc_fourcc_t GetVlcChroma( int i_ffmpeg_chroma )
-{
-    int i;
-
-    /* TODO FIXME for rgb format we HAVE to set rgb mask/shift */
-    for( i = 0; chroma_table[i].i_chroma != 0; i++ )
-    {
-        if( chroma_table[i].i_chroma_id == i_ffmpeg_chroma )
-            return chroma_table[i].i_chroma;
-    }
-    return 0;
-}