Changeset 149e4ec26dc77992ea70cd2f9a1e0de3d0c6dd95

Timestamp:

20/12/04 23:15:13 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[152dbb028e3189a616e78218229e841940e4d987]

git-author:

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

Message:

* src/misc/image.c: implemented ImageWrite?() and ImageWriteUrl?().

Files:

• src/misc/image.c (modified) (7 diffs)

src/misc/image.c

@@ -47 +47 @@
-static decoder_t *CreateDecoder( vlc_object_t *, video_format_t * );
-static void DeleteDecoder( decoder_t * );
+static encoder_t *CreateEncoder( vlc_object_t *, video_format_t *,
+                                 video_format_t * );
+static void DeleteEncoder( encoder_t * );
-static filter_t *CreateFilter( vlc_object_t *, es_format_t *,
-                               video_format_t * );
@@ -82 +85 @@
-
-    if( p_image->p_dec ) DeleteDecoder( p_image->p_dec );
+    if( p_image->p_enc ) DeleteEncoder( p_image->p_enc );
-    if( p_image->p_filter ) DeleteFilter( p_image->p_filter );
-
@@ -216 +220 @@
- */
-
+void PicRelease( picture_t *p_pic ){};
+
-static block_t *ImageWrite( image_handler_t *p_image, picture_t *p_pic,
-                            video_format_t *p_fmt_in,
-                            video_format_t *p_fmt_out )
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -227 +311 @@
-                          const char *psz_url )
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -335 +446 @@
-{
-    decoder_t *p_dec;
-    static es_format_t null_es_format = {0};
-
-    p_dec = vlc_object_create( p_this, VLC_OBJECT_DECODER );
@@ -345 +455 @@
-
-    p_dec->p_module = NULL;
-Copy( &p_dec->fmt_in, &null_es_format
-Copy( &p_dec->fmt_out, &null_es_format
+Init( &p_dec->fmt_in, VIDEO_ES, fmt->i_chroma
+Init( &p_dec->fmt_out, VIDEO_ES, 0
-    p_dec->fmt_in.video = *fmt;
-    p_dec->fmt_in.i_cat = VIDEO_ES;
-    p_dec->fmt_in.i_codec = fmt->i_chroma;
-    p_dec->b_pace_control = VLC_TRUE;
-
@@ -384 +492 @@
-
-    vlc_object_destroy( p_dec );
+}
+
+static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in,
+                                 video_format_t *fmt_out )
+{
+    encoder_t *p_enc;
+
+    p_enc = vlc_object_create( p_this, VLC_OBJECT_ENCODER );
+    if( p_enc == NULL )
+    {
+        msg_Err( p_this, "out of memory" );
+        return NULL;
+    }
+
+    p_enc->p_module = NULL;
+    es_format_Init( &p_enc->fmt_in, VIDEO_ES, fmt_in->i_chroma );
+    p_enc->fmt_in.video = *fmt_in;
+    if( fmt_out->i_width > 0 && fmt_out->i_height > 0 )
+    {
+        p_enc->fmt_in.video.i_width = fmt_out->i_width;
+        p_enc->fmt_in.video.i_height = fmt_out->i_height;
+    }
+    p_enc->fmt_in.video.i_frame_rate = 25;
+    p_enc->fmt_in.video.i_frame_rate_base = 1;
+
+    es_format_Init( &p_enc->fmt_out, VIDEO_ES, fmt_out->i_chroma );
+    p_enc->fmt_out.video = *fmt_out;
+    p_enc->fmt_out.video.i_width = p_enc->fmt_in.video.i_width;
+    p_enc->fmt_out.video.i_height = p_enc->fmt_in.video.i_height;
+
+    vlc_object_attach( p_enc, p_this );
+
+    /* Find a suitable decoder module */
+    p_enc->p_module = module_Need( p_enc, "encoder", 0, 0 );
+    if( !p_enc->p_module )
+    {
+        msg_Err( p_enc, "no suitable encoder module for fourcc `%4.4s'.\n"
+                 "VLC probably does not support this image format.",
+                 (char*)&p_enc->fmt_out.i_codec );
+
+        DeleteEncoder( p_enc );
+        return NULL;
+    }
+    p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec;
+
+    return p_enc;
+}
+
+static void DeleteEncoder( encoder_t * p_enc )
+{
+    vlc_object_detach( p_enc );
+
+    if( p_enc->p_module ) module_Unneed( p_enc, p_enc->p_module );
+
+    es_format_Clean( &p_enc->fmt_in );
+    es_format_Clean( &p_enc->fmt_out );
+
+    vlc_object_destroy( p_enc );
-}
-