generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/tee: Factor parse_slave_options() out

Browse Source 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-08-01 02:51:56 +02:00
parent 8ab200fb8a
commit 35e7fc6030
4 changed files with 101 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -462,7 +462,7 @@ OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o swf.o
OBJS-$(CONFIG_SWF_MUXER) += swfenc.o swf.o
OBJS-$(CONFIG_TAK_DEMUXER) += takdec.o apetag.o img2.o rawdec.o
OBJS-$(CONFIG_TEDCAPTIONS_DEMUXER) += tedcaptionsdec.o subtitles.o
OBJS-$(CONFIG_TEE_MUXER) += tee.o
OBJS-$(CONFIG_TEE_MUXER) += tee.o tee_common.o
OBJS-$(CONFIG_THP_DEMUXER) += thp.o
OBJS-$(CONFIG_THREEDOSTR_DEMUXER) += 3dostr.o
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o

44
libavformat/tee.c
View File

@ -26,6 +26,7 @@
#include "internal.h"
#include "avformat.h"
#include "avio_internal.h"
#include "tee_common.h"
typedef enum {
ON_SLAVE_FAILURE_ABORT = 1,
@ -54,9 +55,6 @@ typedef struct TeeContext {
} TeeContext;
static const char *const slave_delim = "|";
static const char *const slave_opt_open = "[";
static const char *const slave_opt_close = "]";
static const char *const slave_opt_delim = ":]"; /* must have the close too */
static const char *const slave_bsfs_spec_sep = "/";
static const char *const slave_select_sep = ",";
@ -66,44 +64,6 @@ static const AVClass tee_muxer_class = {
.version = LIBAVUTIL_VERSION_INT,
};
static int parse_slave_options(void *log, char *slave,
AVDictionary **options, char **filename)
{
const char *p;
char *key, *val;
int ret;
if (!strspn(slave, slave_opt_open)) {
*filename = slave;
return 0;
}
p = slave + 1;
if (strspn(p, slave_opt_close)) {
*filename = (char *)p + 1;
return 0;
}
while (1) {
ret = av_opt_get_key_value(&p, "=", slave_opt_delim, 0, &key, &val);
if (ret < 0) {
av_log(log, AV_LOG_ERROR, "No option found near \"%s\"\n", p);
goto fail;
}
ret = av_dict_set(options, key, val,
AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
if (ret < 0)
goto fail;
if (strspn(p, slave_opt_close))
break;
p++;
}
*filename = (char *)p + 1;
return 0;
fail:
av_dict_free(options);
return ret;
}
/**
* Parse list of bitstream filters and add them to the list of filters
* pointed to by bsfs.
@ -217,7 +177,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave)
int fullret;
char *subselect = NULL, *next_subselect = NULL, *first_subselect = NULL, *tmp_select = NULL;
if ((ret = parse_slave_options(avf, slave, &options, &filename)) < 0)
if ((ret = ff_tee_parse_slave_options(avf, slave, &options, &filename)) < 0)
return ret;
#define STEAL_OPTION(option, field) do { \

68
libavformat/tee_common.c Normal file
View File

@ -0,0 +1,68 @@
/*
* Tee common code
* Copyright (c) 2012 Nicolas George
*
* This file is part of FFmpeg.
*
* FFmpeg 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.
*
* FFmpeg 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 FFmpeg; if not, write to the Free Software * Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/avutil.h"
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
#include "tee_common.h"
static const char *const slave_opt_open = "[";
static const char *const slave_opt_close = "]";
static const char *const slave_opt_delim = ":]"; /* must have the close too */
int ff_tee_parse_slave_options(void *log, char *slave,
AVDictionary **options, char **filename)
{
const char *p;
char *key, *val;
int ret;
if (!strspn(slave, slave_opt_open)) {
*filename = slave;
return 0;
}
p = slave + 1;
if (strspn(p, slave_opt_close)) {
*filename = (char *)p + 1;
return 0;
}
while (1) {
ret = av_opt_get_key_value(&p, "=", slave_opt_delim, 0, &key, &val);
if (ret < 0) {
av_log(log, AV_LOG_ERROR, "No option found near \"%s\"\n", p);
goto fail;
}
ret = av_dict_set(options, key, val,
AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
if (ret < 0)
goto fail;
if (strspn(p, slave_opt_close))
break;
p++;
}
*filename = (char *)p + 1;
return 0;
fail:
av_dict_free(options);
return ret;
}

30
libavformat/tee_common.h Normal file
View File

@ -0,0 +1,30 @@
/*
* Tee common code
* Copyright (c) 2016 Michael Niedermayer <michael@niedermayer.cc>
*
* This file is part of FFmpeg.
*
* FFmpeg 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.
*
* FFmpeg 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 FFmpeg; if not, write to the Free Software * Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVFORMAT_TEE_COMMON_H
#define AVFORMAT_TEE_COMMON_H
#include "libavutil/dict.h"
int ff_tee_parse_slave_options(void *log, char *slave,
AVDictionary **options, char **filename);
#endif