*
* 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
+ * 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 General Public License for more details.
+ * 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 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.
+ * 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 <vlc_avcodec.h>
#include "avio.h"
+#include "../codec/avcodec/avcommon.h"
#if LIBAVFORMAT_VERSION_MAJOR < 54
# define AVIOContext URLContext
return !vlc_object_alive((vlc_object_t*)access);
}
-struct access_sys_t {
+struct access_sys_t
+{
AVIOContext *context;
+ uint64_t size;
};
struct sout_access_out_sys_t {
vlc_mutex_unlock(&avio_lock);
return VLC_EGENERIC;
}
- url_set_interrupt_cb(access ? UrlInterruptCallback : NULL);
+ url_set_interrupt_cb(access ? UrlInterruptCallbackSingle : NULL);
current_access = access;
}
/* */
- vlc_avcodec_lock();
- av_register_all();
- vlc_avcodec_unlock();
+ vlc_init_avformat(object);
int ret;
#if LIBAVFORMAT_VERSION_MAJOR < 54
.callback = UrlInterruptCallback,
.opaque = access,
};
- ret = avio_open2(&sys->context, url, AVIO_FLAG_READ, &cb, NULL /* options */);
+ AVDictionary *options = NULL;
+ char *psz_opts = var_InheritString(access, "avio-options");
+ if (psz_opts && *psz_opts) {
+ options = vlc_av_get_options(psz_opts);
+ free(psz_opts);
+ }
+ ret = avio_open2(&sys->context, url, AVIO_FLAG_READ, &cb, &options);
+ AVDictionaryEntry *t = NULL;
+ while ((t = av_dict_get(options, "", t, AV_DICT_IGNORE_SUFFIX)))
+ msg_Err( access, "unknown option \"%s\"", t->key );
+ av_dict_free(&options);
#endif
if (ret < 0) {
- errno = AVUNERROR(ret);
- msg_Err(access, "Failed to open %s: %m", url);
+ msg_Err(access, "Failed to open %s: %s", url,
+ vlc_strerror_c(AVUNERROR(ret)));
free(url);
goto error;
}
seekable = sys->context->seekable;
#endif
msg_Dbg(access, "%sseekable, size=%"PRIi64, seekable ? "" : "not ", size);
+ sys->size = size > 0 ? size : 0;
/* */
access_InitFields(access);
- access->info.i_size = size > 0 ? size : 0;
access->pf_read = Read;
access->pf_block = NULL;
}
/* */
+
+static const char *const ppsz_sout_options[] = {
+ "options",
+ NULL,
+};
+
int OutOpenAvio(vlc_object_t *object)
{
sout_access_out_t *access = (sout_access_out_t*)object;
+
+ config_ChainParse( access, "sout-avio-", ppsz_sout_options, access->p_cfg );
+
sout_access_out_sys_t *sys = malloc(sizeof(*sys));
if (!sys)
return VLC_ENOMEM;
sys->context = NULL;
/* */
- vlc_avcodec_lock();
- av_register_all();
- vlc_avcodec_unlock();
+ vlc_init_avformat(object);
if (!access->psz_path)
goto error;
.callback = UrlInterruptCallback,
.opaque = access,
};
+ AVDictionary *options = NULL;
+ char *psz_opts = var_InheritString(access, "sout-avio-options");
+ if (psz_opts && *psz_opts) {
+ options = vlc_av_get_options(psz_opts);
+ free(psz_opts);
+ }
ret = avio_open2(&sys->context, access->psz_path, AVIO_FLAG_WRITE,
- &cb, NULL /* options */);
+ &cb, &options);
+ AVDictionaryEntry *t = NULL;
+ while ((t = av_dict_get(options, "", t, AV_DICT_IGNORE_SUFFIX)))
+ msg_Err( access, "unknown option \"%s\"", t->key );
+ av_dict_free(&options);
#endif
if (ret < 0) {
errno = AVUNERROR(ret);
int r = avio_read(access->p_sys->context, data, size);
if (r > 0)
access->info.i_pos += r;
- else
+ else {
access->info.b_eof = true;
+ r = 0;
+ }
return r;
}
*****************************************************************************/
static ssize_t Write(sout_access_out_t *p_access, block_t *p_buffer)
{
- access_sys_t *p_sys = (access_sys_t*)p_access->p_sys;
+ sout_access_out_sys_t *p_sys = (sout_access_out_sys_t*)p_access->p_sys;
size_t i_write = 0;
+ int val;
while (p_buffer != NULL) {
- block_t *p_next = p_buffer->p_next;;
+ block_t *p_next = p_buffer->p_next;
#if LIBAVFORMAT_VERSION_MAJOR < 54
- i_write += url_write(p_sys->context, p_buffer->p_buffer, p_buffer->i_buffer);
+ val = url_write(p_sys->context, p_buffer->p_buffer, p_buffer->i_buffer);
+ if (val < 0)
+ goto error;
+ i_write += val;
#else
- /* FIXME : how are errors notified ?? */
avio_write(p_sys->context, p_buffer->p_buffer, p_buffer->i_buffer);
+ avio_flush(p_sys->context);
+ if ((val = p_sys->context->error) != 0) {
+ p_sys->context->error = 0; /* FIXME? */
+ goto error;
+ }
i_write += p_buffer->i_buffer;
#endif
}
return i_write;
+
+error:
+ msg_Err(p_access, "Wrote only %zu bytes: %s", i_write,
+ vlc_strerror_c(AVUNERROR(val)));
+ block_ChainRelease( p_buffer );
+ return i_write;
}
static int Seek(access_t *access, uint64_t position)
else
ret = avio_seek(sys->context, position, SEEK_SET);
if (ret < 0) {
- errno = AVUNERROR(ret);
- msg_Err(access, "Seek to %"PRIu64" failed: %m", position);
- if (access->info.i_size <= 0 || position != access->info.i_size)
+ msg_Err(access, "Seek to %"PRIu64" failed: %s", position,
+ vlc_strerror_c(AVUNERROR(ret)));
+ if (sys->size == 0 || position != sys->size)
return VLC_EGENERIC;
}
access->info.i_pos = position;
b = va_arg(args, bool *);
*b = true; /* FIXME */
return VLC_SUCCESS;
+ case ACCESS_GET_SIZE:
+ *va_arg(args, uint64_t *) = sys->size;
+ return VLC_SUCCESS;
case ACCESS_GET_PTS_DELAY: {
int64_t *delay = va_arg(args, int64_t *);
- *delay = DEFAULT_PTS_DELAY; /* FIXME */
+ *delay = INT64_C(1000) * var_InheritInteger(access, "network-caching");
return VLC_SUCCESS;
}
case ACCESS_SET_PAUSE_STATE: {
return VLC_EGENERIC;
return VLC_SUCCESS;
}
- case ACCESS_GET_TITLE_INFO:
- case ACCESS_GET_META:
- case ACCESS_GET_CONTENT_TYPE:
- case ACCESS_GET_SIGNAL:
- case ACCESS_SET_TITLE:
- case ACCESS_SET_SEEKPOINT:
- case ACCESS_SET_PRIVATE_ID_STATE:
- case ACCESS_SET_PRIVATE_ID_CA:
- case ACCESS_GET_PRIVATE_ID_STATE:
default:
return VLC_EGENERIC;
}
projects / vlc / blobdiff