Changeset 28c10c83b4dc8f1de74a1180d68b44a04a6458d4

Timestamp:

08/03/05 14:16:38 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1110287798 +0000

git-parent:

[739d192acea9e963c567f006b477ec278070d3d5]

git-author:

Gildas Bazin <gbazin@videolan.org> 1110287798 +0000

Message:

* modules/codec/ffmpeg/video_filter.c: a few fixes and cleanup.

Files:

• modules/codec/ffmpeg/video_filter.c (modified) (9 diffs)

modules/codec/ffmpeg/video_filter.c

@@ -51 +51 @@
-    vlc_bool_t b_resize;
-    vlc_bool_t b_convert;
+    vlc_bool_t b_resize_first;
-
-    es_format_t fmt_in;
@@ -99 +100 @@
-    /* Misc init */
-    p_sys->p_rsc = NULL;
-    p_sys->b_convert = b_convert;
-    p_sys->i_src_ffmpeg_chroma =
-        E_(GetFfmpegChroma)( p_filter->fmt_in.video.i_chroma );
@@ -108 +108 @@
-    es_format_Init( &p_sys->fmt_out, 0, 0 );
-
+    /* Dummy alloc, will be reallocated in CheckInit */
+    avpicture_alloc( &p_sys->tmp_pic, p_sys->i_src_ffmpeg_chroma,
+                     p_filter->fmt_out.video.i_width,
+                     p_filter->fmt_out.video.i_height );
+
-    if( CheckInit( p_filter ) != VLC_SUCCESS )
-    {
-        free( p_sys );
-        return VLC_EGENERIC;
-    }
-
-    if( p_sys->b_resize && p_sys->b_convert )
-    {
-        if ( p_filter->fmt_in.video.i_width * p_filter->fmt_in.video.i_height >
-             p_filter->fmt_out.video.i_width * p_filter->fmt_out.video.i_height )
-        {
-            /* Resizing then conversion */
-            avpicture_alloc( &p_sys->tmp_pic, p_sys->i_src_ffmpeg_chroma,
-                             p_filter->fmt_out.video.i_width,
-                             p_filter->fmt_out.video.i_height );
-        }
-        else
-        {
-            /* Conversion then resizing */
-            avpicture_alloc( &p_sys->tmp_pic, p_sys->i_dst_ffmpeg_chroma,
-                             p_filter->fmt_in.video.i_width,
-                             p_filter->fmt_in.video.i_height );
-        }
-    }
-
@@ -175 +161 @@
-        p_sys->p_rsc = 0;
-
+        p_sys->b_convert =
+          p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma;
+
-        p_sys->b_resize =
-          p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width ||
-          p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height;
+
+        p_sys->b_resize_first =
+          p_filter->fmt_in.video.i_width * p_filter->fmt_in.video.i_height >
+          p_filter->fmt_out.video.i_width * p_filter->fmt_out.video.i_height;
+
+        if( E_(GetFfmpegChroma)( p_filter->fmt_in.video.i_chroma ) !=
+            VLC_FOURCC('I','4','2','0') )
+            p_sys->b_resize_first = VLC_FALSE;
-
-        if( p_sys->b_resize )
@@ -193 +190 @@
-        }
-
+        avpicture_free( &p_sys->tmp_pic );
+
+        if( p_sys->b_resize_first )
+        {
+            /* Resizing then conversion */
+            avpicture_alloc( &p_sys->tmp_pic, p_sys->i_src_ffmpeg_chroma,
+                             p_filter->fmt_out.video.i_width,
+                             p_filter->fmt_out.video.i_height );
+        }
+        else
+        {
+            /* Conversion then resizing */
+            avpicture_alloc( &p_sys->tmp_pic, p_sys->i_dst_ffmpeg_chroma,
+                             p_filter->fmt_in.video.i_width,
+                             p_filter->fmt_in.video.i_height );
+        }
+
-        p_sys->fmt_in = p_filter->fmt_in;
-        p_sys->fmt_out = p_filter->fmt_out;
@@ -209 +223 @@
-    AVPicture *p_src, *p_dst;
-    picture_t *p_pic_dst;
-    vlc_bool_t b_resize = p_sys->b_resize;
-    int i;
-
@@ -257 +270 @@
-    p_src = &src_pic;
-
-
+p_sys->
-    {
-        p_dst = &dest_pic;
-
-
-
-
+
+
+
-            img_resample( p_sys->p_rsc, p_dst, p_src );
-            b_resize = VLC_FALSE;
-            p_src = p_dst;
-        }
@@ -274 +285 @@
-        video_format_t *p_fmt = &p_filter->fmt_out.video;
-        p_dst = &dest_pic;
-b_resize
+p_sys->b_resize && !p_sys->b_resize_first
-        {
-            p_dst = &p_sys->tmp_pic;
@@ -287 +298 @@
-    }
-
-b_resize
+p_sys->b_resize && !p_sys->b_resize_first
-    {
-        p_dst = &dest_pic;