Changeset a2caeb589c2a22159eccda561298807fe961adc7

Timestamp:

06/09/08 10:05:35 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212998735 +0200

git-parent:

[24463d005000387f52b962cc29558981e6975025]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212878840 +0200

Message:

Remove crop/padd code from imgresample module. Imgresample is now only
1 submodule (well, 1 main module) which can take care of resizing and
chroma conversion (basically it's the old chroma.c code). All the files
have been merged in imgresample.c. In the long run I might split
resizing and chroma conversion to 2 submodules (performance impact would
be nil). (This is untested.)

Files:

• modules/codec/ffmpeg/Modules.am (modified) (1 diff)
• modules/codec/ffmpeg/chroma.c (deleted)
• modules/codec/ffmpeg/imgresample.c (modified) (2 diffs)
• modules/codec/ffmpeg/imgresample.h (deleted)
• modules/codec/ffmpeg/video_filter.c (deleted)

modules/codec/ffmpeg/Modules.am

@@ -20 +20 @@
-SOURCES_imgresample = \
-    imgresample.c \
-    imgresample.h \
-    chroma.c \
-    video_filter.c \
-    chroma.h \
-    $(NULL)

modules/codec/ffmpeg/imgresample.c

@@ -32 +32 @@
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*****************************************************************************
@@ -43 +62 @@
-    set_callbacks( OpenFilter, CloseFilter );
-    set_description( N_("FFmpeg video filter") );
-
-    /* crop/padd submodule */
-    add_submodule();
-    set_capability( "crop padd", 10 ); /* FIXME / Remove */
-    set_callbacks( OpenCropPadd, CloseFilter );
-    set_description( N_("FFmpeg crop padd filter") );
-
-    /* chroma conversion submodule */
-    add_submodule();
-    set_capability( "video filter2", 50 );
-    set_callbacks( OpenChroma, CloseChroma );
-    set_description( N_("FFmpeg chroma conversion") );
-vlc_module_end();
+
+/*****************************************************************************
+ * chroma_sys_t: chroma method descriptor
+ *****************************************************************************
+ * This structure is part of the chroma transformation descriptor, it
+ * describes the chroma plugin specific properties.
+ *****************************************************************************/
+struct filter_sys_t
+{
+    int i_src_vlc_chroma;
+    int i_src_ffmpeg_chroma;
+    int i_dst_vlc_chroma;
+    int i_dst_ffmpeg_chroma;
+    AVPicture tmp_pic;
+    ImgReSampleContext *p_rsc;
+};
+
+/*****************************************************************************
+ * OpenFilter: allocate a chroma function
+ *****************************************************************************
+ * This function allocates and initializes a chroma function
+ *****************************************************************************/
+int OpenFilter( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    int i_ffmpeg_chroma[2], i_vlc_chroma[2], i;
+
+    /*
+     * Check the source chroma first, then the destination chroma
+     */
+    i_vlc_chroma[0] = p_filter->fmt_in.video.i_chroma;
+    i_vlc_chroma[1] = p_filter->fmt_out.video.i_chroma;
+    for( i = 0; i < 2; i++ )
+    {
+        i_ffmpeg_chroma[i] = GetFfmpegChroma( i_vlc_chroma[i] );
+        if( i_ffmpeg_chroma[i] < 0 ) return VLC_EGENERIC;
+    }
+
+    p_filter->pf_video_filter = Conversion_Filter;
+
+    p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
+    if( p_filter->p_sys == NULL )
+    {
+        return VLC_ENOMEM;
+    }
+
+    p_filter->p_sys->i_src_vlc_chroma = p_filter->fmt_in.video.i_chroma;
+    p_filter->p_sys->i_dst_vlc_chroma = p_filter->fmt_out.video.i_chroma;
+    p_filter->p_sys->i_src_ffmpeg_chroma = i_ffmpeg_chroma[0];
+    p_filter->p_sys->i_dst_ffmpeg_chroma = i_ffmpeg_chroma[1];
+
+    if( ( p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height ||
+          p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width ) &&
+        ( p_filter->p_sys->i_dst_vlc_chroma == VLC_FOURCC('I','4','2','0') ||
+          p_filter->p_sys->i_dst_vlc_chroma == VLC_FOURCC('Y','V','1','2') ))
+    {
+        msg_Dbg( p_filter, "preparing to resample picture" );
+        p_filter->p_sys->p_rsc =
+            img_resample_init( p_filter->fmt_out.video.i_width,
+                               p_filter->fmt_out.video.i_height,
+                               p_filter->fmt_in.video.i_width,
+                               p_filter->fmt_in.video.i_height );
+        avpicture_alloc( &p_filter->p_sys->tmp_pic,
+                         p_filter->p_sys->i_dst_ffmpeg_chroma,
+                         p_filter->fmt_in.video.i_width,
+                         p_filter->fmt_in.video.i_height );
+    }
+    else
+    {
+        msg_Dbg( p_filter, "no resampling" );
+        p_filter->p_sys->p_rsc = NULL;
+    }
+
+    return VLC_SUCCESS;
+}
+
+VIDEO_FILTER_WRAPPER( Conversion )
+
+/*****************************************************************************
+ * ChromaConversion: actual chroma conversion function
+ *****************************************************************************/
+static void Conversion( filter_t *p_filter,
+                        picture_t *p_src, picture_t *p_dest )
+{
+    AVPicture src_pic;
+    AVPicture dest_pic;
+    int i;
+
+    /* Prepare the AVPictures for converion */
+    for( i = 0; i < p_src->i_planes; i++ )
+    {
+        src_pic.data[i] = p_src->p[i].p_pixels;
+        src_pic.linesize[i] = p_src->p[i].i_pitch;
+    }
+    for( i = 0; i < p_dest->i_planes; i++ )
+    {
+        dest_pic.data[i] = p_dest->p[i].p_pixels;
+        dest_pic.linesize[i] = p_dest->p[i].i_pitch;
+    }
+
+    /* Special cases */
+    if( p_filter->p_sys->i_src_vlc_chroma == VLC_FOURCC('Y','V','1','2') ||
+        p_filter->p_sys->i_src_vlc_chroma == VLC_FOURCC('Y','V','U','9') )
+    {
+        /* Invert U and V */
+        src_pic.data[1] = p_src->p[2].p_pixels;
+        src_pic.data[2] = p_src->p[1].p_pixels;
+    }
+    if( p_filter->p_sys->i_dst_vlc_chroma == VLC_FOURCC('Y','V','1','2') ||
+        p_filter->p_sys->i_dst_vlc_chroma == VLC_FOURCC('Y','V','U','9') )
+    {
+        /* Invert U and V */
+        dest_pic.data[1] = p_dest->p[2].p_pixels;
+        dest_pic.data[2] = p_dest->p[1].p_pixels;
+    }
+    if( p_filter->p_sys->i_src_ffmpeg_chroma == PIX_FMT_RGB24 )
+        if( p_filter->fmt_in.video.i_bmask == 0x00ff0000 )
+            p_filter->p_sys->i_src_ffmpeg_chroma = PIX_FMT_BGR24;
+
+    if( p_filter->p_sys->p_rsc )
+    {
+        img_convert( &p_filter->p_sys->tmp_pic,
+                     p_filter->p_sys->i_dst_ffmpeg_chroma,
+                     &src_pic, p_filter->p_sys->i_src_ffmpeg_chroma,
+                     p_filter->fmt_in.video.i_width,
+                     p_filter->fmt_in.video.i_height );
+        img_resample( p_filter->p_sys->p_rsc, &dest_pic,
+                      &p_filter->p_sys->tmp_pic );
+    }
+    else
+    {
+        img_convert( &dest_pic, p_filter->p_sys->i_dst_ffmpeg_chroma,
+                     &src_pic, p_filter->p_sys->i_src_ffmpeg_chroma,
+                     p_filter->fmt_in.video.i_width,
+                     p_filter->fmt_in.video.i_height );
+    }
+}
+
+/*****************************************************************************
+ * CloseFilter: free the chroma function
+ *****************************************************************************
+ * This function frees the previously allocated chroma function
+ *****************************************************************************/
+void CloseFilter( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    if( p_filter->p_sys->p_rsc )
+    {
+        img_resample_close( p_filter->p_sys->p_rsc );
+        avpicture_free( &p_filter->p_sys->tmp_pic );
+    }
+    free( p_filter->p_sys );
+}