Added an access for reading input attachments.

modules/access/Modules.am

@@ -44,6 +44,7 @@ SOURCES_access_mtp = mtp.c
 SOURCES_access_sftp = sftp.c
 SOURCES_access_imem = imem.c
 SOURCES_access_avio = avio.c avio.h
+SOURCES_access_attachment = attachment.c
 
 libaccess_rtmp_plugin_la_SOURCES = \
         rtmp/access.c \
@@ -65,6 +66,7 @@ libvlc_LTLIBRARIES += \
 	libaccess_fake_plugin.la \
 	libaccess_rtmp_plugin.la \
 	libaccess_imem_plugin.la \
+	libaccess_attachment_plugin.la \
 	$(NULL)
 
 libxcb_screen_plugin_la_SOURCES = screen/xcb.c

modules/access/attachment.c

+/*****************************************************************************
+ * attachment.c: Input reading an attachment.
+ *****************************************************************************
+ * Copyright (C) 2009 Laurent Aimar
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_access.h>
+#include <vlc_input.h>
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int  Open (vlc_object_t *);
+static void Close(vlc_object_t *);
+
+vlc_module_begin()
+    set_shortname(N_("Attachment"))
+    set_description(N_("Attachment input"))
+    set_category(CAT_INPUT)
+    set_subcategory(SUBCAT_INPUT_ACCESS)
+
+    set_capability("access", 0)
+    add_shortcut("attachment")
+    set_callbacks(Open, Close)
+vlc_module_end()
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+struct access_sys_t {
+    input_attachment_t *a;
+};
+
+static ssize_t Read(access_t *, uint8_t *, size_t);
+static int     Seek(access_t *, int64_t);
+static int     Control(access_t *, int, va_list);
+
+/* */
+static int Open(vlc_object_t *object)
+{
+    access_t     *access = (access_t *)object;
+    access_sys_t *sys;
+
+    input_thread_t *input = access_GetParentInput(access);
+    if (!input)
+        return VLC_EGENERIC;
+
+    input_attachment_t *a;
+    if (input_Control(input, INPUT_GET_ATTACHMENT, &a, access->psz_path))
+        a = NULL;
+
+    vlc_object_release(input);
+
+    if (!a) {
+        msg_Err(access, "Failed to find the attachment '%s'", access->psz_path);
+        return VLC_EGENERIC;
+    }
+
+    /* */
+    access->p_sys = sys = malloc(sizeof(*sys));
+    if (!sys) {
+        vlc_input_attachment_Delete(a);
+        return VLC_ENOMEM;
+    }
+    sys->a = a;
+
+    /* */
+    access_InitFields(access);
+    access->pf_read    = Read;
+    access->pf_block   = NULL;
+    access->pf_control = Control;
+    access->pf_seek    = Seek;
+
+    return VLC_SUCCESS;
+}
+
+/* */
+static void Close(vlc_object_t *object)
+{
+    access_t     *access = (access_t *)object;
+    access_sys_t *sys = access->p_sys;
+
+    vlc_input_attachment_Delete(sys->a);
+    free(sys);
+}
+
+/* */
+static ssize_t Read(access_t *access, uint8_t *buffer, size_t size)
+{
+    access_sys_t *sys = access->p_sys;
+
+    access->info.b_eof = access->info.i_pos >= sys->a->i_data;
+    if (access->info.b_eof)
+        return 0;
+
+    const size_t copy = __MIN(size, sys->a->i_data - access->info.i_pos);
+    memcpy(buffer, (uint8_t*)sys->a->p_data + access->info.i_pos, copy);
+    access->info.i_pos += copy;
+    return copy;
+}
+
+/* */
+static int Seek(access_t *access, int64_t position)
+{
+    access->info.i_pos = position;
+    access->info.b_eof = false;
+    return VLC_SUCCESS;
+}
+
+/* */
+static int Control(access_t *access, int query, va_list args)
+{
+    VLC_UNUSED(access);
+    switch (query)
+    {
+    /* */
+    case ACCESS_CAN_SEEK:
+    case ACCESS_CAN_FASTSEEK:
+    case ACCESS_CAN_PAUSE:
+    case ACCESS_CAN_CONTROL_PACE: {
+        bool *b = va_arg(args, bool*);
+        *b = true;
+        return VLC_SUCCESS;
+    }
+    case ACCESS_GET_PTS_DELAY: {
+        int64_t *d = va_arg(args, int64_t *);
+        *d = DEFAULT_PTS_DELAY;
+        return VLC_SUCCESS;
+    }
+    case ACCESS_SET_PAUSE_STATE:
+        return VLC_SUCCESS;
+
+    default:
+        return VLC_EGENERIC;
+    }
+}
+