access: merge stream_access.c and access.c

po/POTFILES.in

@@ -77,7 +77,6 @@ src/darwin/error.c
 src/extras/libc.c
 src/extras/tdestroy.c
 src/input/access.c
-src/input/access.h
 src/input/clock.c
 src/input/clock.h
 src/input/control.c

src/Makefile.am

@@ -361,7 +361,6 @@ SOURCES_libvlc_common = \
 	input/input.c \
 	input/info.h \
 	input/meta.c \
-	input/access.h \
 	input/clock.h \
 	input/decoder.h \
 	input/demux.h \
@@ -378,7 +377,6 @@ SOURCES_libvlc_common = \
 	input/resource.c \
 	input/stats.c \
 	input/stream.c \
-	input/stream_access.c \
 	input/stream_demux.c \
 	input/stream_filter.c \
 	input/stream_memory.c \

src/input/access.c

@@ -26,11 +26,17 @@
 #endif
 
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "access.h"
-#include <libvlc.h>
+#include <vlc_common.h>
 #include <vlc_url.h>
 #include <vlc_modules.h>
+#include <vlc_interrupt.h>
+
+#include <libvlc.h>
+#include "stream.h"
+#include "input_internal.h"
 
 /* Decode URL (which has had its scheme stripped earlier) to a file path. */
 char *get_path(const char *location)
@@ -51,7 +57,7 @@ char *get_path(const char *location)
 /*****************************************************************************
  * access_New:
  *****************************************************************************/
-access_t *access_New(vlc_object_t *parent, input_thread_t *input,
+static access_t *access_New(vlc_object_t *parent, input_thread_t *input,
                             const char *mrl)
 {
     const char *p = strstr(mrl, "://");
@@ -136,3 +142,238 @@ int access_vaDirectoryControlHelper( access_t *p_access, int i_query, va_list ar
      }
      return VLC_SUCCESS;
 }
+
+struct stream_sys_t
+{
+    access_t *access;
+    block_t  *block;
+};
+
+/* Block access */
+static ssize_t AStreamReadBlock(stream_t *s, void *buf, size_t len)
+{
+    stream_sys_t *sys = s->p_sys;
+    input_thread_t *input = s->p_input;
+    block_t *block = sys->block;
+
+    while (block == NULL)
+    {
+        if (vlc_access_Eof(sys->access))
+            return 0;
+        if (vlc_killed())
+            return -1;
+
+        block = vlc_access_Block(sys->access);
+    }
+
+    if (input != NULL)
+    {
+        uint64_t total;
+
+        vlc_mutex_lock(&input->p->counters.counters_lock);
+        stats_Update(input->p->counters.p_read_bytes, block->i_buffer, &total);
+        stats_Update(input->p->counters.p_input_bitrate, total, NULL);
+        stats_Update(input->p->counters.p_read_packets, 1, NULL);
+        vlc_mutex_unlock(&input->p->counters.counters_lock);
+    }
+
+    size_t copy = block->i_buffer < len ? block->i_buffer : len;
+
+    if (likely(copy > 0) && buf != NULL /* skipping data? */)
+        memcpy(buf, block->p_buffer, copy);
+
+    block->p_buffer += copy;
+    block->i_buffer -= copy;
+
+    if (block->i_buffer == 0)
+        block_Release(block);
+    else
+        sys->block = block;
+
+    return copy;
+}
+
+/* Read access */
+static ssize_t AStreamReadStream(stream_t *s, void *buf, size_t len)
+{
+    stream_sys_t *sys = s->p_sys;
+    input_thread_t *input = s->p_input;
+    ssize_t val = 0;
+
+    do
+    {
+        if (vlc_access_Eof(sys->access))
+            return 0;
+        if (vlc_killed())
+            return -1;
+
+        val = vlc_access_Read(sys->access, buf, len);
+        if (val == 0)
+            return 0; /* EOF */
+    }
+    while (val < 0);
+
+    if (input != NULL)
+    {
+        uint64_t total;
+
+        vlc_mutex_lock(&input->p->counters.counters_lock);
+        stats_Update(input->p->counters.p_read_bytes, val, &total);
+        stats_Update(input->p->counters.p_input_bitrate, total, NULL);
+        stats_Update(input->p->counters.p_read_packets, 1, NULL);
+        vlc_mutex_unlock(&input->p->counters.counters_lock);
+    }
+
+    return val;
+}
+
+/* Directory */
+static input_item_t *AStreamReadDir(stream_t *s)
+{
+    stream_sys_t *sys = s->p_sys;
+
+    if (sys->access->pf_readdir == NULL)
+        return NULL;
+    return sys->access->pf_readdir(sys->access);
+}
+
+/* Common */
+#define static_control_match(foo) \
+    static_assert((unsigned) STREAM_##foo == ACCESS_##foo, "Mismatch")
+
+static int AStreamControl(stream_t *s, int cmd, va_list args)
+{
+    stream_sys_t *sys = s->p_sys;
+    access_t *access = sys->access;
+
+    static_control_match(CAN_SEEK);
+    static_control_match(CAN_FASTSEEK);
+    static_control_match(CAN_PAUSE);
+    static_control_match(CAN_CONTROL_PACE);
+    static_control_match(GET_SIZE);
+    static_control_match(GET_PTS_DELAY);
+    static_control_match(GET_TITLE_INFO);
+    static_control_match(GET_TITLE);
+    static_control_match(GET_SEEKPOINT);
+    static_control_match(GET_META);
+    static_control_match(GET_CONTENT_TYPE);
+    static_control_match(GET_SIGNAL);
+    static_control_match(SET_PAUSE_STATE);
+    static_control_match(SET_TITLE);
+    static_control_match(SET_SEEKPOINT);
+    static_control_match(SET_PRIVATE_ID_STATE);
+    static_control_match(SET_PRIVATE_ID_CA);
+    static_control_match(GET_PRIVATE_ID_STATE);
+
+    switch (cmd)
+    {
+        case STREAM_CAN_SEEK:
+        case STREAM_CAN_FASTSEEK:
+        case STREAM_CAN_PAUSE:
+        case STREAM_CAN_CONTROL_PACE:
+        case STREAM_GET_SIZE:
+        case STREAM_GET_PTS_DELAY:
+        case STREAM_GET_TITLE_INFO:
+        case STREAM_GET_TITLE:
+        case STREAM_GET_SEEKPOINT:
+        case STREAM_GET_META:
+        case STREAM_GET_CONTENT_TYPE:
+        case STREAM_GET_SIGNAL:
+        case STREAM_SET_PAUSE_STATE:
+        case STREAM_SET_TITLE:
+        case STREAM_SET_SEEKPOINT:
+        case STREAM_SET_PRIVATE_ID_STATE:
+        case STREAM_SET_PRIVATE_ID_CA:
+        case STREAM_GET_PRIVATE_ID_STATE:
+            return access_vaControl(access, cmd, args);
+
+        case STREAM_IS_DIRECTORY:
+        {
+            bool *b;
+
+            *va_arg(args, bool *) = access->pf_readdir != NULL;
+            b = va_arg(args, bool *);
+            if (b != NULL)
+                *b = access->info.b_dir_sorted;
+            b = va_arg(args, bool *);
+            if (b != NULL)
+                *b = access->info.b_dir_can_loop;
+            break;
+        }
+
+        case STREAM_GET_POSITION:
+        {
+            uint64_t *ppos =va_arg(args, uint64_t *);
+
+            *ppos = access->info.i_pos;
+            if (sys->block != NULL)
+            {
+                assert(sys->block->i_buffer <= *ppos);
+                *ppos -= sys->block->i_buffer;
+            }
+            break;
+        }
+
+        case STREAM_SET_POSITION:
+        {
+            uint64_t pos = va_arg(args, uint64_t);
+
+            if (sys->block != NULL)
+            {
+                block_Release(sys->block);
+                sys->block = NULL;
+            }
+            return vlc_access_Seek(sys->access, pos);
+        }
+
+        default:
+            return VLC_EGENERIC;
+    }
+    return VLC_SUCCESS;
+}
+
+static void AStreamDestroy(stream_t *s)
+{
+    stream_sys_t *sys = s->p_sys;
+
+    if (sys->block != NULL)
+        block_Release(sys->block);
+    vlc_access_Delete(sys->access);
+    free(sys);
+}
+
+stream_t *stream_AccessNew(vlc_object_t *parent, input_thread_t *input,
+                           const char *url)
+{
+    stream_t *s = stream_CommonNew(parent);
+    if (unlikely(s == NULL))
+        return NULL;
+
+    s->p_input = input;
+    s->psz_url = strdup(url);
+
+    stream_sys_t *sys = malloc(sizeof (*sys));
+    if (unlikely(s->psz_url == NULL || sys == NULL))
+        goto error;
+
+    sys->access = access_New(VLC_OBJECT(s), input, url);
+    if (sys->access == NULL)
+        goto error;
+
+    sys->block = NULL;
+
+    s->p_sys      = sys;
+    if (sys->access->pf_block != NULL)
+        s->pf_read = AStreamReadBlock;
+    else
+        s->pf_read = AStreamReadStream;
+    s->pf_readdir = AStreamReadDir;
+    s->pf_control = AStreamControl;
+    s->pf_destroy = AStreamDestroy;
+
+    return s;
+error:
+    free(sys);
+    stream_Delete(s);
+    return NULL;
+}

src/input/access.h

-/*****************************************************************************
- * access.h: Input access functions
- *****************************************************************************
- * Copyright (C) 1998-2008 VLC authors and VideoLAN
- * Copyright (C) 2008 Laurent Aimar
- * $Id$
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
- * 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 Lesser General Public License for more details.
- *
- * 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.
- *****************************************************************************/
-
-#ifndef LIBVLC_INPUT_ACCESS_H
-#define LIBVLC_INPUT_ACCESS_H 1
-
-#include <vlc_common.h>
-#include <vlc_access.h>
-
-access_t *access_New(vlc_object_t *, input_thread_t *, const char *);
-char *get_path(const char *location);
-
-#endif
-

src/input/demux.c

@@ -25,7 +25,6 @@
 # include "config.h"
 #endif
 
-#include "access.h"
 #include "demux.h"
 #include <libvlc.h>
 #include <vlc_codec.h>

src/input/input.c

@@ -41,7 +41,6 @@
 #include "event.h"
 #include "es_out.h"
 #include "es_out_timeshift.h"
-#include "access.h"
 #include "demux.h"
 #include "stream.h"
 #include "item.h"

src/input/stream.h

@@ -61,4 +61,7 @@ stream_t *stream_FilterAutoNew( stream_t *source ) VLC_USED;
  * source to another filter.
  */
 stream_t *stream_FilterChainNew( stream_t *p_source, const char *psz_chain );
+
+char *get_path(const char *location);
+
 #endif

src/input/stream_access.c

-/*****************************************************************************
- * stream_access.c
- *****************************************************************************
- * Copyright (C) 1999-2004 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
- * 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 Lesser General Public License for more details.
- *
- * 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.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <vlc_common.h>
-#include <vlc_interrupt.h>
-
-#include <libvlc.h>
-#include "access.h"
-#include "stream.h"
-#include "input_internal.h"
-
-struct stream_sys_t
-{
-    access_t *access;
-    block_t  *block;
-};
-
-/* Block access */
-static ssize_t AStreamReadBlock(stream_t *s, void *buf, size_t len)
-{
-    stream_sys_t *sys = s->p_sys;
-    input_thread_t *input = s->p_input;
-    block_t *block = sys->block;
-
-    while (block == NULL)
-    {
-        if (vlc_access_Eof(sys->access))
-            return 0;
-        if (vlc_killed())
-            return -1;
-
-        block = vlc_access_Block(sys->access);
-    }
-
-    if (input != NULL)
-    {
-        uint64_t total;
-
-        vlc_mutex_lock(&input->p->counters.counters_lock);
-        stats_Update(input->p->counters.p_read_bytes, block->i_buffer, &total);
-        stats_Update(input->p->counters.p_input_bitrate, total, NULL);
-        stats_Update(input->p->counters.p_read_packets, 1, NULL);
-        vlc_mutex_unlock(&input->p->counters.counters_lock);
-    }
-
-    size_t copy = block->i_buffer < len ? block->i_buffer : len;
-
-    if (likely(copy > 0) && buf != NULL /* skipping data? */)
-        memcpy(buf, block->p_buffer, copy);
-
-    block->p_buffer += copy;
-    block->i_buffer -= copy;
-
-    if (block->i_buffer == 0)
-        block_Release(block);
-    else
-        sys->block = block;
-
-    return copy;
-}
-
-/* Read access */
-static ssize_t AStreamReadStream(stream_t *s, void *buf, size_t len)
-{
-    stream_sys_t *sys = s->p_sys;
-    input_thread_t *input = s->p_input;
-    ssize_t val = 0;
-
-    do
-    {
-        if (vlc_access_Eof(sys->access))
-            return 0;
-        if (vlc_killed())
-            return -1;
-
-        val = vlc_access_Read(sys->access, buf, len);
-        if (val == 0)
-            return 0; /* EOF */
-    }
-    while (val < 0);
-
-    if (input != NULL)
-    {
-        uint64_t total;
-
-        vlc_mutex_lock(&input->p->counters.counters_lock);
-        stats_Update(input->p->counters.p_read_bytes, val, &total);
-        stats_Update(input->p->counters.p_input_bitrate, total, NULL);
-        stats_Update(input->p->counters.p_read_packets, 1, NULL);
-        vlc_mutex_unlock(&input->p->counters.counters_lock);
-    }
-
-    return val;
-}
-
-/* Directory */
-static input_item_t *AStreamReadDir(stream_t *s)
-{
-    stream_sys_t *sys = s->p_sys;
-
-    if (sys->access->pf_readdir == NULL)
-        return NULL;
-    return sys->access->pf_readdir(sys->access);
-}
-
-/* Common */
-#define static_control_match(foo) \
-    static_assert((unsigned) STREAM_##foo == ACCESS_##foo, "Mismatch")
-
-static int AStreamControl(stream_t *s, int cmd, va_list args)
-{
-    stream_sys_t *sys = s->p_sys;
-    access_t *access = sys->access;
-
-    static_control_match(CAN_SEEK);
-    static_control_match(CAN_FASTSEEK);
-    static_control_match(CAN_PAUSE);
-    static_control_match(CAN_CONTROL_PACE);
-    static_control_match(GET_SIZE);
-    static_control_match(GET_PTS_DELAY);
-    static_control_match(GET_TITLE_INFO);
-    static_control_match(GET_TITLE);
-    static_control_match(GET_SEEKPOINT);
-    static_control_match(GET_META);
-    static_control_match(GET_CONTENT_TYPE);
-    static_control_match(GET_SIGNAL);
-    static_control_match(SET_PAUSE_STATE);
-    static_control_match(SET_TITLE);
-    static_control_match(SET_SEEKPOINT);
-    static_control_match(SET_PRIVATE_ID_STATE);
-    static_control_match(SET_PRIVATE_ID_CA);
-    static_control_match(GET_PRIVATE_ID_STATE);
-
-    switch (cmd)
-    {
-        case STREAM_CAN_SEEK:
-        case STREAM_CAN_FASTSEEK:
-        case STREAM_CAN_PAUSE:
-        case STREAM_CAN_CONTROL_PACE:
-        case STREAM_GET_SIZE:
-        case STREAM_GET_PTS_DELAY:
-        case STREAM_GET_TITLE_INFO:
-        case STREAM_GET_TITLE:
-        case STREAM_GET_SEEKPOINT:
-        case STREAM_GET_META:
-        case STREAM_GET_CONTENT_TYPE:
-        case STREAM_GET_SIGNAL:
-        case STREAM_SET_PAUSE_STATE:
-        case STREAM_SET_TITLE:
-        case STREAM_SET_SEEKPOINT:
-        case STREAM_SET_PRIVATE_ID_STATE:
-        case STREAM_SET_PRIVATE_ID_CA:
-        case STREAM_GET_PRIVATE_ID_STATE:
-            return access_vaControl(access, cmd, args);
-
-        case STREAM_IS_DIRECTORY:
-        {
-            bool *b;
-
-            *va_arg(args, bool *) = access->pf_readdir != NULL;
-            b = va_arg(args, bool *);
-            if (b != NULL)
-                *b = access->info.b_dir_sorted;
-            b = va_arg(args, bool *);
-            if (b != NULL)
-                *b = access->info.b_dir_can_loop;
-            break;
-        }
-
-        case STREAM_GET_POSITION:
-        {
-            uint64_t *ppos =va_arg(args, uint64_t *);
-
-            *ppos = access->info.i_pos;
-            if (sys->block != NULL)
-            {
-                assert(sys->block->i_buffer <= *ppos);
-                *ppos -= sys->block->i_buffer;
-            }
-            break;
-        }
-
-        case STREAM_SET_POSITION:
-        {
-            uint64_t pos = va_arg(args, uint64_t);
-
-            if (sys->block != NULL)
-            {
-                block_Release(sys->block);
-                sys->block = NULL;
-            }
-            return vlc_access_Seek(sys->access, pos);
-        }
-
-        default:
-            return VLC_EGENERIC;
-    }
-    return VLC_SUCCESS;
-}
-
-static void AStreamDestroy(stream_t *s)
-{
-    stream_sys_t *sys = s->p_sys;
-
-    if (sys->block != NULL)
-        block_Release(sys->block);
-    vlc_access_Delete(sys->access);
-    free(sys);
-}
-
-stream_t *stream_AccessNew(vlc_object_t *parent, input_thread_t *input,
-                           const char *url)
-{
-    stream_t *s = stream_CommonNew(parent);
-    if (unlikely(s == NULL))
-        return NULL;
-
-    s->p_input = input;
-    s->psz_url = strdup(url);
-
-    stream_sys_t *sys = malloc(sizeof (*sys));
-    if (unlikely(s->psz_url == NULL || sys == NULL))
-        goto error;
-
-    sys->access = access_New(VLC_OBJECT(s), input, url);
-    if (sys->access == NULL)
-        goto error;
-
-    sys->block = NULL;
-
-    s->p_sys      = sys;
-    if (sys->access->pf_block != NULL)
-        s->pf_read = AStreamReadBlock;
-    else
-        s->pf_read = AStreamReadStream;
-    s->pf_readdir = AStreamReadDir;
-    s->pf_control = AStreamControl;
-    s->pf_destroy = AStreamDestroy;
-
-    return s;
-error:
-    free(sys);
-    stream_Delete(s);
-    return NULL;
-}