Le quintidi 5 germinal, an CCXXIV, Jan Sebechlebsky a écrit :
> Adds per slave option 'onfail' to the tee muxer allowing an output to
> fail,so other slave outputs can continue.
>
> Signed-off-by: Jan Sebechlebsky <sebechlebsky...@gmail.com>
> ---
> doc/muxers.texi | 14 +++++++++
> libavformat/tee.c | 91
> +++++++++++++++++++++++++++++++++++++++++++++++++------
> 2 files changed, 96 insertions(+), 9 deletions(-)
>
> diff --git a/doc/muxers.texi b/doc/muxers.texi
> index c36c72c..6fa9054 100644
> --- a/doc/muxers.texi
> +++ b/doc/muxers.texi
> @@ -1367,6 +1367,12 @@ Select the streams that should be mapped to the slave
> output,
> specified by a stream specifier. If not specified, this defaults to
> all the input streams. You may use multiple stream specifiers
> separated by commas (@code{,}) e.g.: @code{a:0,v}
> +
> +@item onfail
> +Specify behaviour on output failure. This can be set to either 'abort'
> (which is
I believe @code{...} is recommended for explicit words.
> +default) or 'ignore'. 'abort' will cause whole process to fail in case of
> failure
> +on this slave output. 'ignore' will ignore failure on this output, so other
> outputs
> +will continue without being affected.
> @end table
>
> @subsection Examples
> @@ -1381,6 +1387,14 @@ ffmpeg -i ... -c:v libx264 -c:a mp2 -f tee -map 0:v
> -map 0:a
> @end example
>
> @item
> +As above, but continue streaming even if output to local file fails
> +(for example local drive fills up):
> +@example
> +ffmpeg -i ... -c:v libx264 -c:a mp2 -f tee -map 0:v -map 0:a
> + "[onfail=ignore]archive-20121107.mkv|[f=mpegts]udp://10.0.1.255:1234/"
> +@end example
> +
> +@item
> Use @command{ffmpeg} to encode the input, and send the output
> to three different destinations. The @code{dump_extra} bitstream
> filter is used to add extradata information to all the output video
> diff --git a/libavformat/tee.c b/libavformat/tee.c
> index e43ef08..a937efc 100644
> --- a/libavformat/tee.c
> +++ b/libavformat/tee.c
> @@ -29,10 +29,20 @@
>
> #define MAX_SLAVES 16
>
> +typedef enum {
> + ON_SLAVE_FAILURE_ABORT = 1,
> + ON_SLAVE_FAILURE_IGNORE = 2
> +} SlaveFailurePolicy;
> +
> +#define DEFAULT_SLAVE_FAILURE_POLICY ON_SLAVE_FAILURE_ABORT
> +
> typedef struct {
> AVFormatContext *avf;
> AVBitStreamFilterContext **bsfs; ///< bitstream filters per stream
>
> + SlaveFailurePolicy on_fail;
> + unsigned char is_alive;
> +
> /** map from input to output streams indexes,
> * disabled output streams are set to -1 */
> int *stream_map;
> @@ -41,6 +51,7 @@ typedef struct {
> typedef struct TeeContext {
> const AVClass *class;
> unsigned nb_slaves;
> + unsigned nb_alive;
> TeeSlave slaves[MAX_SLAVES];
> } TeeContext;
>
> @@ -135,6 +146,18 @@ end:
> return ret;
> }
>
> +static inline int parse_slave_failure_policy_option(const char * opt)
> +{
> + if (!opt) {
> + return DEFAULT_SLAVE_FAILURE_POLICY;
> + } else if (!av_strcasecmp("abort",opt)) {
Spaces to breathe. And do we want case-insensitive comparison?
> + return ON_SLAVE_FAILURE_ABORT;
> + } else if (!av_strcasecmp("ignore",opt)) {
> + return ON_SLAVE_FAILURE_IGNORE;
> + }
> + return 0;
> +}
> +
> static void close_slave(TeeSlave* tee_slave)
> {
> AVFormatContext * avf;
> @@ -176,7 +199,7 @@ static int open_slave(AVFormatContext *avf, char *slave,
> TeeSlave *tee_slave)
> AVDictionary *options = NULL;
> AVDictionaryEntry *entry;
> char *filename;
> - char *format = NULL, *select = NULL;
> + char *format = NULL, *select = NULL, *on_fail = NULL;
> AVFormatContext *avf2 = NULL;
> AVStream *st, *st2;
> int stream_count;
> @@ -196,6 +219,17 @@ static int open_slave(AVFormatContext *avf, char *slave,
> TeeSlave *tee_slave)
>
> STEAL_OPTION("f", format);
> STEAL_OPTION("select", select);
> + STEAL_OPTION("onfail", on_fail);
> +
> + tee_slave->on_fail = (SlaveFailurePolicy)
> parse_slave_failure_policy_option(on_fail);
Why return an int and then cast the result?
> + if (!tee_slave->on_fail) {
> + av_log(avf, AV_LOG_ERROR,
> + "Invalid onfail option value, valid options are 'abort' and
> 'ignore'\n");
Inconsistent indentation.
> + ret = AVERROR(EINVAL);
> + /// Set failure behaviour to abort, so invalid option error will not
> be ignored
This is not a doxygen comment.
> + tee_slave->on_fail = ON_SLAVE_FAILURE_ABORT;
> + goto end;
> + }
>
> ret = avformat_alloc_output_context2(&avf2, NULL, format, filename);
> if (ret < 0)
> @@ -345,6 +379,7 @@ end:
> }
> av_free(format);
> av_free(select);
> + av_free(on_fail);
> av_dict_free(&options);
> av_freep(&tmp_select);
> return ret;
> @@ -374,6 +409,31 @@ static void log_slave(TeeSlave *slave, void *log_ctx,
> int log_level)
> }
> }
>
> +static int tee_process_slave_failure(AVFormatContext * avf,unsigned
> slave_idx,
> + int err_n,unsigned char needs_closing)
Inconsistent indentation and spacing.
> +{
> + TeeContext *tee = avf->priv_data;
> + TeeSlave *tee_slave = &tee->slaves[slave_idx];
> +
> + tee_slave->is_alive = 0;
> + tee->nb_alive--;
> +
> + if (needs_closing)
> + close_slave(tee_slave);
> +
> + if ( !tee->nb_alive ) {
Ditto, and a few similar below.
> + av_log(avf, AV_LOG_ERROR, "All tee outputs failed.\n");
> + return err_n;
> + } else if (tee_slave->on_fail == ON_SLAVE_FAILURE_ABORT ) {
> + av_log(avf, AV_LOG_ERROR, "Slave muxer #%u failed,aborting.\n",
> slave_idx + 1);
> + return err_n;
> + } else {
> + av_log(avf, AV_LOG_ERROR, "Slave muxer #%u failed, continuing with
> %u/%u slaves.\n",
> + slave_idx + 1, tee->nb_alive, tee->nb_slaves);
FFmpeg usually uses 0-based numbering even for user interaction.
> + return 0;
> + }
> +}
> +
> static int tee_write_header(AVFormatContext *avf)
> {
> TeeContext *tee = avf->priv_data;
> @@ -397,19 +457,25 @@ static int tee_write_header(AVFormatContext *avf)
> filename++;
> }
>
> + tee->nb_slaves = tee->nb_alive = nb_slaves;
> +
> for (i = 0; i < nb_slaves; i++) {
> - if ((ret = open_slave(avf, slaves[i], &tee->slaves[i])) < 0)
> - goto fail;
> - log_slave(&tee->slaves[i], avf, AV_LOG_VERBOSE);
> + if ((ret = open_slave(avf, slaves[i], &tee->slaves[i])) < 0) {
> + ret = tee_process_slave_failure(avf,i,ret,0);
> + if ( ret < 0 )
> + goto fail;
> + } else {
> + log_slave(&tee->slaves[i], avf, AV_LOG_VERBOSE);
> + tee->slaves[i].is_alive = 1;
> + }
> av_freep(&slaves[i]);
> }
>
> - tee->nb_slaves = nb_slaves;
> -
> for (i = 0; i < avf->nb_streams; i++) {
> int j, mapped = 0;
> for (j = 0; j < tee->nb_slaves; j++)
> - mapped += tee->slaves[j].stream_map[i] >= 0;
> + if (tee->slaves[j].is_alive)
> + mapped += tee->slaves[j].stream_map[i] >= 0;
> if (!mapped)
> av_log(avf, AV_LOG_WARNING, "Input stream #%d is not mapped "
> "to any slave.\n", i);
> @@ -431,6 +497,8 @@ static int tee_write_trailer(AVFormatContext *avf)
> unsigned i;
>
> for (i = 0; i < tee->nb_slaves; i++) {
> + if (!tee->slaves[i].is_alive)
> + continue;
> avf2 = tee->slaves[i].avf;
> if ((ret = av_write_trailer(avf2)) < 0)
> if (!ret_all)
> @@ -453,6 +521,9 @@ static int tee_write_packet(AVFormatContext *avf,
> AVPacket *pkt)
> AVRational tb, tb2;
>
> for (i = 0; i < tee->nb_slaves; i++) {
> + if (!tee->slaves[i].is_alive)
> + continue;
> +
> avf2 = tee->slaves[i].avf;
> s = pkt->stream_index;
> s2 = tee->slaves[i].stream_map[s];
> @@ -474,9 +545,11 @@ static int tee_write_packet(AVFormatContext *avf,
> AVPacket *pkt)
>
> if ((ret = av_apply_bitstream_filters(avf2->streams[s2]->codec,
> &pkt2,
> tee->slaves[i].bsfs[s2])) < 0
> ||
> - (ret = av_interleaved_write_frame(avf2, &pkt2)) < 0)
> - if (!ret_all)
> + (ret = av_interleaved_write_frame(avf2, &pkt2)) < 0) {
> + ret = tee_process_slave_failure(avf,i,ret,1);
> + if (!ret_all && ret < 0)
> ret_all = ret;
> + }
> }
> return ret_all;
> }
Regards,
--
Nicolas George
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
