#define RELEASE_LONGTEXT N_(\
"Address of the release callback function")
+#define SIZE_TEXT N_("Size")
+#define SIZE_LONGTEXT N_(\
+ "Size of stream in bytes")
+
vlc_module_begin()
set_shortname(N_("Memory input"))
set_description(N_("Memory input"))
change_private()
change_safe()
+ add_integer ("imem-size", 0, NULL, SIZE_TEXT, SIZE_LONGTEXT, true)
+ change_private()
+ change_safe()
+
add_shortcut("imem")
set_capability("access_demux", 0)
set_callbacks(OpenDemux, CloseDemux)
} imem_sys_t;
static void ParseMRL(vlc_object_t *, const char *);
-#define var_CreateGetRational(a,b,c,d) var_CreateGetRational(VLC_OBJECT(a),b,c,d)
-static int (var_CreateGetRational)(vlc_object_t *,
- unsigned *num, unsigned *den,
- const char *var);
/**
* It closes the common part of the access and access_demux
{
char *tmp;
- /* */
+ /* */
imem_sys_t *sys = calloc(1, sizeof(*sys));
- if (!sys)
- return VLC_ENOMEM;
+ if (!sys)
+ return VLC_ENOMEM;
/* Read the user functions */
- tmp = var_CreateGetString(object, "imem-get");
+ tmp = var_InheritString(object, "imem-get");
if (tmp)
sys->source.get = (imem_get_t)(intptr_t)strtoll(tmp, NULL, 0);
free(tmp);
- tmp = var_CreateGetString(object, "imem-release");
+ tmp = var_InheritString(object, "imem-release");
if (tmp)
sys->source.release = (imem_release_t)(intptr_t)strtoll(tmp, NULL, 0);
free(tmp);
return VLC_EGENERIC;
}
- tmp = var_CreateGetString(object, "imem-data");
+ tmp = var_InheritString(object, "imem-data");
if (tmp)
sys->source.data = (void *)(uintptr_t)strtoull(tmp, NULL, 0);
free(tmp);
sys->source.cookie ? sys->source.cookie : "(null)");
/* */
- sys->pts_delay = var_CreateGetInteger(object, "imem-caching") * INT64_C(1000);
+ sys->pts_delay = var_InheritInteger(object, "imem-caching") * INT64_C(1000);
sys->dts = 0;
sys->deadline = VLC_TS_INVALID;
access_t *access = (access_t *)object;
imem_sys_t *sys;
- if (OpenCommon(object, &sys, access->psz_path))
+ if (OpenCommon(object, &sys, access->psz_location))
return VLC_EGENERIC;
if (var_InheritInteger(object, "imem-cat") != 4) {
access->pf_block = Block;
access->pf_seek = NULL;
access->p_sys = (access_sys_t*)sys;
+ access->info.i_size = var_InheritInteger(object, "imem-size");
return VLC_SUCCESS;
}
demux_t *demux = (demux_t *)object;
imem_sys_t *sys;
- if (OpenCommon(object, &sys, demux->psz_path))
+ if (OpenCommon(object, &sys, demux->psz_location))
return VLC_EGENERIC;
- /* ES format */
+ /* ES format */
es_format_t fmt;
- es_format_Init(&fmt, UNKNOWN_ES, 0);
+ es_format_Init(&fmt, UNKNOWN_ES, 0);
- fmt.i_id = var_CreateGetInteger(object, "imem-id");
- fmt.i_group = var_CreateGetInteger(object, "imem-group");
+ fmt.i_id = var_InheritInteger(object, "imem-id");
+ fmt.i_group = var_InheritInteger(object, "imem-group");
- char *tmp = var_CreateGetString(object, "imem-codec");
+ char *tmp = var_InheritString(object, "imem-codec");
if (tmp)
fmt.i_codec = vlc_fourcc_GetCodecFromString(UNKNOWN_ES, tmp);
free(tmp);
switch (cat) {
case 1: {
fmt.i_cat = AUDIO_ES;
- fmt.audio.i_channels = var_CreateGetInteger(object, "imem-channels");
- fmt.audio.i_rate = var_CreateGetInteger(object, "imem-samplerate");
+ fmt.audio.i_channels = var_InheritInteger(object, "imem-channels");
+ fmt.audio.i_rate = var_InheritInteger(object, "imem-samplerate");
msg_Dbg(object, "Audio %4.4s %d channels %d Hz",
(const char *)&fmt.i_codec,
}
case 2: {
fmt.i_cat = VIDEO_ES;
- fmt.video.i_width = var_CreateGetInteger(object, "imem-width");
- fmt.video.i_height = var_CreateGetInteger(object, "imem-height");
+ fmt.video.i_width = var_InheritInteger(object, "imem-width");
+ fmt.video.i_height = var_InheritInteger(object, "imem-height");
unsigned num, den;
- if (!var_CreateGetRational(object, &num, &den, "imem-dar") && num > 0 && den > 0) {
+ if (!var_InheritURational(object, &num, &den, "imem-dar") && num > 0 && den > 0) {
if (fmt.video.i_width > 0 && fmt.video.i_height > 0) {
fmt.video.i_sar_num = num * fmt.video.i_height;
fmt.video.i_sar_den = den * fmt.video.i_width;
}
}
- if (!var_CreateGetRational(object, &num, &den, "imem-fps") && num > 0 && den > 0) {
+ if (!var_InheritURational(object, &num, &den, "imem-fps") && num > 0 && den > 0) {
fmt.video.i_frame_rate = num;
fmt.video.i_frame_rate_base = den;
}
case 3: {
fmt.i_cat = SPU_ES;
fmt.subs.spu.i_original_frame_width =
- var_CreateGetInteger(object, "imem-width");
+ var_InheritInteger(object, "imem-width");
fmt.subs.spu.i_original_frame_height =
- var_CreateGetInteger(object, "imem-height");
+ var_InheritInteger(object, "imem-height");
msg_Dbg(object, "Subtitle %4.4s",
(const char *)&fmt.i_codec);
return VLC_EGENERIC;
}
- fmt.psz_language = var_CreateGetString(object, "imem-language");
+ fmt.psz_language = var_InheritString(object, "imem-language");
- sys->es = es_out_Add(demux->out, &fmt);
+ sys->es = es_out_Add(demux->out, &fmt);
es_format_Clean(&fmt);
if (!sys->es) {
return 1;
}
-/**
- * It parses a rational number (it also accepts basic float number).
- *
- * It returns an error if the rational number cannot be parsed (0/0 is valid).
- */
-static int (var_CreateGetRational)(vlc_object_t *object,
- unsigned *num, unsigned *den,
- const char *var)
-{
- /* */
- *num = 0;
- *den = 0;
-
- /* */
- char *tmp = var_CreateGetString(object, var);
- if (!tmp)
- goto error;
-
- char *next;
- unsigned n = strtol(tmp, &next, 0);
- unsigned d = strtol(*next ? &next[1] : "0", NULL, 0);
-
- if (*next == '.') {
- /* Interpret as a float number */
- double r = us_atof(tmp);
- double c = ceil(r);
- if (c >= UINT_MAX)
- goto error;
- unsigned m = c;
- if (m > 0) {
- d = UINT_MAX / m;
- n = r * d;
- } else {
- n = 0;
- d = 0;
- }
- }
-
- if (n > 0 && d > 0)
- vlc_ureduce(num, den, n, d, 0);
-
- free(tmp);
- return VLC_SUCCESS;
-
-error:
- free(tmp);
- return VLC_EGENERIC;
-}
-
/**
* Parse the MRL and extract configuration from it.
*
projects / vlc / blobdiff