May 2016 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] ffprobe: Support adding av_log output to frames
by Michael Niedermayer 27 Mar '17

27 Mar '17

adding demuxer and other logs should be easy This forces single threaded decoding for simplicity It also requires pthreads, this could be avoided either with some lockless tricks or simply by assuming av_log would never be called from another thread. doc/ffprobe.xsd update missing (TODO & help welcome) Fixes Ticket5521 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- ffprobe.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 1 deletion(-) diff --git a/ffprobe.c b/ffprobe.c index a7e329c..07b61ec 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -49,6 +49,19 @@ #include "libpostproc/postprocess.h" #include "cmdutils.h" +#if HAVE_PTHREADS +# include <pthread.h> +#else +# ifdef pthread_mutex_lock +# undef pthread_mutex_lock +# endif +# define pthread_mutex_lock(a) +# ifdef pthread_mutex_unlock +# undef pthread_mutex_unlock +# endif +# define pthread_mutex_unlock(a) +#endif + typedef struct InputStream { AVStream *st; @@ -84,6 +97,7 @@ static int do_show_library_versions = 0; static int do_show_pixel_formats = 0; static int do_show_pixel_format_flags = 0; static int do_show_pixel_format_components = 0; +static int do_show_log = 0; static int do_show_chapter_tags = 0; static int do_show_format_tags = 0; @@ -92,6 +106,7 @@ static int do_show_program_tags = 0; static int do_show_stream_tags = 0; static int do_show_packet_tags = 0; + static int show_value_unit = 0; static int use_value_prefix = 0; static int use_byte_value_binary_prefix = 0; @@ -146,6 +161,8 @@ typedef enum { SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, SECTION_ID_FRAME_SIDE_DATA, + SECTION_ID_FRAME_LOG, + SECTION_ID_FRAME_LOGS, SECTION_ID_LIBRARY_VERSION, SECTION_ID_LIBRARY_VERSIONS, SECTION_ID_PACKET, @@ -185,10 +202,12 @@ static struct section sections[] = { [SECTION_ID_FORMAT] = { SECTION_ID_FORMAT, "format", 0, { SECTION_ID_FORMAT_TAGS, -1 } }, [SECTION_ID_FORMAT_TAGS] = { SECTION_ID_FORMAT_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "format_tags" }, [SECTION_ID_FRAMES] = { SECTION_ID_FRAMES, "frames", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME, SECTION_ID_SUBTITLE, -1 } }, - [SECTION_ID_FRAME] = { SECTION_ID_FRAME, "frame", 0, { SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, -1 } }, + [SECTION_ID_FRAME] = { SECTION_ID_FRAME, "frame", 0, { SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, SECTION_ID_FRAME_LOGS, -1 } }, [SECTION_ID_FRAME_TAGS] = { SECTION_ID_FRAME_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "frame_tags" }, [SECTION_ID_FRAME_SIDE_DATA_LIST] ={ SECTION_ID_FRAME_SIDE_DATA_LIST, "side_data_list", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA, -1 } }, [SECTION_ID_FRAME_SIDE_DATA] = { SECTION_ID_FRAME_SIDE_DATA, "side_data", 0, { -1 } }, + [SECTION_ID_FRAME_LOGS] = { SECTION_ID_FRAME_LOGS, "logs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_LOG, -1 } }, + [SECTION_ID_FRAME_LOG] = { SECTION_ID_FRAME_LOG, "log", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 } }, [SECTION_ID_LIBRARY_VERSIONS] = { SECTION_ID_LIBRARY_VERSIONS, "library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } }, [SECTION_ID_LIBRARY_VERSION] = { SECTION_ID_LIBRARY_VERSION, "library_version", 0, { -1 } }, [SECTION_ID_PACKETS] = { SECTION_ID_PACKETS, "packets", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PACKET, -1} }, @@ -255,11 +274,73 @@ static uint64_t *nb_streams_packets; static uint64_t *nb_streams_frames; static int *selected_streams; +#if HAVE_PTHREADS +pthread_mutex_t log_mutex; +#endif +typedef struct LogBuffer { + char *context_name; + int log_level; + char *log_message; + AVClassCategory category; + char *parent_name; + AVClassCategory parent_category; +}LogBuffer; + +static LogBuffer *log_buffer; +static int log_buffer_size; + +static void log_callback(void *ptr, int level, const char *fmt, va_list vl) +{ + AVClass* avc = ptr ? *(AVClass **) ptr : NULL; + va_list vl2; + char line[1024]; + static int print_prefix = 1; + void *new_log_buffer; + + va_copy(vl2, vl); + av_log_default_callback(ptr, level, fmt, vl); + av_log_format_line(ptr, level, fmt, vl2, line, sizeof(line), &print_prefix); + va_end(vl2); + +#if HAVE_PTHREADS + pthread_mutex_lock(&log_mutex); + + new_log_buffer = av_realloc_array(log_buffer, log_buffer_size + 1, sizeof(*log_buffer)); + if (new_log_buffer) { + log_buffer = new_log_buffer; + memset(&log_buffer[log_buffer_size], 0, sizeof(log_buffer[log_buffer_size])); + log_buffer[log_buffer_size].context_name= avc ? av_strdup(avc->item_name(ptr)) : NULL; + if (avc) { + if (avc->get_category) log_buffer[log_buffer_size].category = avc->get_category(ptr); + else log_buffer[log_buffer_size].category = avc->category; + } + log_buffer[log_buffer_size].log_level = level; + log_buffer[log_buffer_size].log_message = av_strdup(line); + if (avc && avc->parent_log_context_offset) { + AVClass** parent = *(AVClass ***) (((uint8_t *) ptr) + + avc->parent_log_context_offset); + if (parent && *parent) { + log_buffer[log_buffer_size].parent_name = av_strdup((*parent)->item_name(parent)); + log_buffer[log_buffer_size].parent_category = + (*parent)->get_category ? (*parent)->get_category(parent) :(*parent)->category; + } + } + log_buffer_size ++; + } + + pthread_mutex_unlock(&log_mutex); +#endif +} + static void ffprobe_cleanup(int ret) { int i; for (i = 0; i < FF_ARRAY_ELEMS(sections); i++) av_dict_free(&(sections[i].entries_to_show)); + +#if HAVE_PTHREADS + pthread_mutex_destroy(&log_mutex); +#endif } struct unit_value { @@ -1759,6 +1840,56 @@ static inline int show_tags(WriterContext *w, AVDictionary *tags, int section_id return ret; } +static void clear_log(int need_lock) +{ + int i; + + if (need_lock) + pthread_mutex_lock(&log_mutex); + for (i=0; i<log_buffer_size; i++) { + av_freep(&log_buffer[i].context_name); + av_freep(&log_buffer[i].log_message); + } + log_buffer_size = 0; + if(need_lock) + pthread_mutex_unlock(&log_mutex); +} + +static int show_log(WriterContext *w, int section_ids, int section_id, int log_level) +{ + int i; + pthread_mutex_lock(&log_mutex); + if (!log_buffer_size) { + pthread_mutex_unlock(&log_mutex); + return 0; + } + writer_print_section_header(w, section_ids); + + for (i=0; i<log_buffer_size; i++) { + if (log_buffer[i].log_level <= log_level) { + writer_print_section_header(w, section_id); + print_str("context", log_buffer[i].context_name); + print_int("level", log_buffer[i].log_level); + print_int("category", log_buffer[i].category); + if (log_buffer[i].parent_name) { + print_str("parent_context", log_buffer[i].parent_name); + print_int("parent_category", log_buffer[i].parent_category); + } else { + print_str_opt("parent_context", "N/A"); + print_str_opt("parent_category", "N/A"); + } + print_str("message", log_buffer[i].log_message); + writer_print_section_footer(w); + } + } + clear_log(0); + pthread_mutex_unlock(&log_mutex); + + writer_print_section_footer(w); + + return 0; +} + static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int packet_idx) { char val_str[128]; @@ -1917,6 +2048,8 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, } if (do_show_frame_tags) show_tags(w, av_frame_get_metadata(frame), SECTION_ID_FRAME_TAGS); + if (do_show_log) + show_log(w, SECTION_ID_FRAME_LOGS, SECTION_ID_FRAME_LOG, do_show_log); if (frame->nb_side_data) { writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA_LIST); for (i = 0; i < frame->nb_side_data; i++) { @@ -1956,6 +2089,7 @@ static av_always_inline int process_frame(WriterContext *w, AVSubtitle sub; int ret = 0, got_frame = 0; + clear_log(1); if (dec_ctx && dec_ctx->codec) { switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: @@ -2604,6 +2738,13 @@ static int open_input_file(InputFile *ifile, const char *filename) if (err < 0) exit(1); + if (do_show_log) { + // For loging it is needed to disable at least frame threads as otherwise + // the log information would need to be reordered and matches up to contexts and frames + // That is in fact possible but not trivial + av_dict_set(&codec_opts, "threads", "1", 0); + } + ist->dec_ctx->pkt_timebase = stream->time_base; #if FF_API_LAVF_AVCTX ist->dec_ctx->time_base = stream->codec->time_base; @@ -3191,6 +3332,9 @@ static const OptionDef real_options[] = { "show a particular entry from the format/container info", "entry" }, { "show_entries", HAS_ARG, {.func_arg = opt_show_entries}, "show a set of specified entries", "entry_list" }, +#if HAVE_PTHREADS + { "show_log", OPT_INT|HAS_ARG, {(void*)&do_show_log}, "show log" }, +#endif { "show_packets", 0, {(void*)&opt_show_packets}, "show packets info" }, { "show_programs", 0, {(void*)&opt_show_programs}, "show programs info" }, { "show_streams", 0, {(void*)&opt_show_streams}, "show streams info" }, @@ -3235,6 +3379,14 @@ int main(int argc, char **argv) char *w_name = NULL, *w_args = NULL; int ret, i; +#if HAVE_PTHREADS + ret = pthread_mutex_init(&log_mutex, NULL); + if (ret != 0) { + goto end; + } +#endif + av_log_set_callback(log_callback); + av_log_set_flags(AV_LOG_SKIP_REPEATED); register_exit(ffprobe_cleanup); -- 1.7.9.5

4 13

[PATCH]lavf/mpeg: Identify sub-stream ID 0xa1 as mlp
by Carl Eugen Hoyos 02 Mar '17

02 Mar '17

Hi! Attached patch (still) fixes ticket #4786 for me. Autodetection seems impossible to me and the following page suggests that this patch is likely correct: http://dvd-audio.sourceforge.net/spec/aob.shtml Please comment, Carl Eugen

3 3

[rfc] ffmpeg security issue mailing list
by compn 09 Feb '17

09 Feb '17

hello, some of you know that we have a list for security / CVE issues. some of you did not know this. i think it is a private list due to not wanting people to make exploits before we have a chance to fix them. of course, if no one is subscribed to review/fix issues then they will never get fixed. so if you are a regular developer who wants access to this list, please speak up. i do not run nor admin the security email/list (nor do i know who does) so please dont ask me questions about it. -compn

6 12

[PATCH] avfilter: add threshold filter
by Paul B Mahol 30 Jan '17

30 Jan '17

Hi, patch attached.

1 1

(no subject)
by Matthieu Bouron 12 Jan '17

12 Jan '17

Hello, The following patchset add an audio frame pool for each link of the filtergraph. It extends the FFVideoFramePool API to support audio (and renames it to FFFramePool). The performance gain on a rpi2 is very little. malloc+free goes from 2.50% to 1.84% cpu time with the following command line: perf record ./ffmpeg_g -f lavfi -i sine=440,asetnsamples=4096,aformat=sample_fmts=s16,aresample=48000 -t 500 -f null - For reference, most of the time (81%) is spend in request_frame and in the resample function. Given the performance gain, i'm not sure if it's really useful. However it could be a good idea to have this API to use it in both libavcodec (and replace what is being done in lavc/utils.c) and libavfilter for audio and video if made public or semi-public later on. Best regards, Matthieu

2 19

[PATCH] avcodec: add jpeg2000_parser
by Paul B Mahol 18 Dec '16

18 Dec '16

Hi, patch attached.

2 5

[PATCH 1/2] img2: added support for %t output pattern
by Yuval Adam 05 Dec '16

05 Dec '16

From: Yuval Adam <yuv.adm(a)gmail.com> The image2 muxer now supports timestamps in output filenames. When used in an output patterm '%t' will be replaced with the frames timestamp in hours, minutes and seconds (hh:mm:ss). Signed-off-by: Yuval Adam <yuv.adm(a)gmail.com> --- doc/muxers.texi | 5 +++++ libavformat/avformat.h | 6 ++++-- libavformat/img2.c | 13 ++++++++----- libavformat/utils.c | 32 +++++++++++++++++++++++++------- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 60a72d6..72212fe 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -109,6 +109,11 @@ If the pattern contains "%d" or "%0@var{N}d", the first filename of the file list specified will contain the number 1, all the following numbers will be sequential. +The pattern may also contain "%t", this string specifies the timestamp +of the frame in hours, minutes and seconds. Note that if two frames are written at the +same second, they will be overwritten, yielding a maximum output of 1 fps. +The "%t" and "%d" patterns may not be used simultaneously. + The pattern may contain a suffix which is used to automatically determine the format of the image files to write. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2ed6b56..a9ab0cc 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2067,7 +2067,8 @@ attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1 #endif /** - * Return in 'buf' the path with '%d' replaced by a number. + * Return in 'buf' the path with '%d' replaced by the frame number, + * and '%t' replaced by the frame timestamp. * * Also handles the '%0nd' format where 'n' is the total number * of digits and '%%'. @@ -2076,10 +2077,11 @@ attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1 * @param buf_size destination buffer size * @param path numbered sequence string * @param number frame number + * @param ts frame timestamp in seconds * @return 0 if OK, -1 on format error */ int av_get_frame_filename(char *buf, int buf_size, - const char *path, int number); + const char *path, int number, int ts); /** * Check whether filename actually is a numbered sequence generator. diff --git a/libavformat/img2.c b/libavformat/img2.c index bc35591..8012e5b 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -142,7 +142,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, /* find the first image */ for(first_index = 0; first_index < 5; first_index++) { - if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){ + if (av_get_frame_filename(buf, sizeof(buf), path, first_index, 0) < 0){ *pfirst_index = *plast_index = 1; if (avio_check(buf, AVIO_FLAG_READ) > 0) @@ -165,7 +165,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, else range1 = 2 * range; if (av_get_frame_filename(buf, sizeof(buf), path, - last_index + range1) < 0) + last_index + range1, 0) < 0) goto fail; if (avio_check(buf, AVIO_FLAG_READ) <= 0) break; @@ -310,7 +310,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) if (s->img_number > s->img_last) return AVERROR_EOF; if (av_get_frame_filename(filename, sizeof(filename), - s->path, s->img_number)<0 && s->img_number > 1) + s->path, s->img_number, 0)<0 && s->img_number > 1) return AVERROR(EIO); for(i=0; i<3; i++){ if (avio_open2(&f[i], filename, AVIO_FLAG_READ, @@ -389,12 +389,15 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) VideoData *img = s->priv_data; AVIOContext *pb[3]; char filename[1024]; - AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec; + AVStream *stream = s->streams[ pkt->stream_index ]; + AVCodecContext *codec = stream->codec; int i; + int ts = av_rescale_q(pkt->pts, stream->time_base, AV_TIME_BASE_Q) / AV_TIME_BASE; + if (!img->is_pipe) { if (av_get_frame_filename(filename, sizeof(filename), - img->path, img->img_number) < 0 && img->img_number>1 && !img->updatefirst) { + img->path, img->img_number, ts) < 0 && img->img_number>1 && !img->updatefirst) { av_log(s, AV_LOG_ERROR, "Could not get frame filename number %d from pattern '%s'\n", img->img_number, img->path); diff --git a/libavformat/utils.c b/libavformat/utils.c index f0df759..6db2db0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -319,7 +319,7 @@ int av_append_packet(AVIOContext *s, AVPacket *pkt, int size) int av_filename_number_test(const char *filename) { char buf[1024]; - return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); + return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1, 0)>=0); } AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret) @@ -3774,15 +3774,16 @@ int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info) #endif int av_get_frame_filename(char *buf, int buf_size, - const char *path, int number) + const char *path, int number, int ts) { const char *p; char *q, buf1[20], c; - int nd, len, percentd_found; + int nd, len, percent_found; + int hours, mins, secs; q = buf; p = path; - percentd_found = 0; + percent_found = 0; for(;;) { c = *p++; if (c == '\0') @@ -3800,9 +3801,9 @@ int av_get_frame_filename(char *buf, int buf_size, case '%': goto addchar; case 'd': - if (percentd_found) + if (percent_found) goto fail; - percentd_found = 1; + percent_found = 1; snprintf(buf1, sizeof(buf1), "%0*d", nd, number); len = strlen(buf1); if ((q - buf + len) > buf_size - 1) @@ -3810,6 +3811,23 @@ int av_get_frame_filename(char *buf, int buf_size, memcpy(q, buf1, len); q += len; break; + case 't': + if (percent_found) + goto fail; + percent_found = 1; + secs = ts % 60; + ts /= 60; + mins = ts % 60; + ts /= 60; + hours = ts; + snprintf(buf1, sizeof(buf1), + "%02d:%02d:%02d", hours, mins, secs); + len = strlen(buf1); + if ((q - buf + len) > buf_size - 1) + goto fail; + memcpy(q, buf1, len); + q += len; + break; default: goto fail; } @@ -3819,7 +3837,7 @@ int av_get_frame_filename(char *buf, int buf_size, *q++ = c; } } - if (!percentd_found) + if (!percent_found) goto fail; *q = '\0'; return 0; -- 1.7.2.2

4 22

[PATCH] lavf/matroskaenc.c: add early support for colour elements
by Neil Birkbeck 05 Dec '16

05 Dec '16

Adding early support for a subset of the proposed colour elements according to the latest version of spec: https://mailarchive.ietf.org/arch/search/?email_list=cellar&gbt=1&index=hIK… Like matroskadec, I've left out elements for pix_fmt related things as there still seems to be some discussion around these. The new elements are exposed under strict experimental mode. Signed-off-by: Neil Birkbeck <neil.birkbeck(a)gmail.com> --- libavformat/matroskaenc.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f42434b..ce5c605 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -41,6 +41,7 @@ #include "libavutil/intfloat.h" #include "libavutil/intreadwrite.h" #include "libavutil/lfg.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/random_seed.h" @@ -730,6 +731,64 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, return ret; } +static int mkv_write_video_color(AVIOContext *pb, AVCodecContext *codec, AVStream *st) { + int side_data_size = 0; + const uint8_t *side_data = av_stream_get_side_data( + st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, &side_data_size); + ebml_master colorinfo = start_ebml_master(pb, MATROSKA_ID_VIDEOCOLOR, 0); + + if (codec->color_trc != AVCOL_TRC_UNSPECIFIED && + codec->color_trc < AVCOL_TRC_NB) { + put_ebml_uint(pb, MATROSKA_ID_VIDEOCOLORTRANSFERCHARACTERISTICS, + codec->color_trc); + } + if (codec->colorspace != AVCOL_SPC_UNSPECIFIED && + codec->colorspace < AVCOL_SPC_NB) { + put_ebml_uint(pb, MATROSKA_ID_VIDEOCOLORMATRIXCOEFF, codec->colorspace); + } + if (codec->color_primaries != AVCOL_PRI_UNSPECIFIED && + codec->color_primaries < AVCOL_PRI_NB) { + put_ebml_uint(pb, MATROSKA_ID_VIDEOCOLORPRIMARIES, codec->color_primaries); + } + if (codec->color_range != AVCOL_RANGE_UNSPECIFIED && + codec->color_range < AVCOL_RANGE_NB) { + put_ebml_uint(pb, MATROSKA_ID_VIDEOCOLORRANGE, codec->color_range); + } + if (side_data_size == sizeof(AVMasteringDisplayMetadata)) { + ebml_master meta_element = start_ebml_master( + pb, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 0); + const AVMasteringDisplayMetadata *metadata = + (const AVMasteringDisplayMetadata*)side_data; + if (metadata->has_primaries) { + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_RX, + av_q2d(metadata->display_primaries[0][0])); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_RY, + av_q2d(metadata->display_primaries[0][1])); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_GX, + av_q2d(metadata->display_primaries[1][0])); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_GY, + av_q2d(metadata->display_primaries[1][1])); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_BX, + av_q2d(metadata->display_primaries[2][0])); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_BY, + av_q2d(metadata->display_primaries[2][1])); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_WHITEX, + av_q2d(metadata->white_point[0])); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_WHITEY, + av_q2d(metadata->white_point[1])); + } + if (metadata->has_luminance) { + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_LUMINANCEMAX, + av_q2d(metadata->max_luminance)); + put_ebml_float(pb, MATROSKA_ID_VIDEOCOLOR_LUMINANCEMIN, + av_q2d(metadata->min_luminance)); + } + end_ebml_master(pb, meta_element); + } + end_ebml_master(pb, colorinfo); + return 0; +} + static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, AVStream *st, int mode, int *h_width, int *h_height) @@ -1015,7 +1074,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, uint32_t color_space = av_le2ne32(codec->codec_tag); put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space)); } - + if (s->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) { + mkv_write_video_color(pb, codec, st); + } end_ebml_master(pb, subinfo); break; -- 2.7.0.rc3.207.g0ac5344

3 4

[PATCH] MAINTAINERS: add myself as an API tests maintainer
by Ludmila Glinskih 21 Nov '16

21 Nov '16

--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a909211..68f0f18 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -48,6 +48,7 @@ project server Árpád Gereöffy, Michael Niedermayer, presets Robert Swain metadata subsystem Aurelien Jacobs release management Michael Niedermayer +API tests Ludmila Glinskih Communication -- 1.9.1

2 2

[PATCH] avformat: Add Pro-MPEG CoP #3-R2 FEC protocol
by Vlad Tarca 13 Nov '16

13 Nov '16

Pro-MPEG Code of Practice #3 release 2 forward error correction for rtp_mpegts streams Signed-off-by: Vlad Tarca <vtarca(a)mobibase.com> --- Changelog | 1 + doc/general.texi | 1 + doc/protocols.texi | 38 ++++ libavformat/Makefile | 1 + libavformat/prompeg.c | 493 ++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/protocols.c | 1 + libavformat/rtpproto.c | 62 +++++- 7 files changed, 595 insertions(+), 2 deletions(-) create mode 100644 libavformat/prompeg.c diff --git a/Changelog b/Changelog index 3f343ce..d6a882f 100644 --- a/Changelog +++ b/Changelog @@ -34,6 +34,7 @@ version <next>: - DTS Express (LBR) decoder - Generic OpenMAX IL encoder with support for Raspberry Pi - IFF ANIM demuxer & decoder +- Pro-MPEG CoP #3-R2 FEC protocol version 3.0: - Common Encryption (CENC) MP4 encoding and decoding support diff --git a/doc/general.texi b/doc/general.texi index 59ea4f4..2cbf41c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1124,6 +1124,7 @@ performance on systems without hardware floating point support). @item MMSH @tab X @item MMST @tab X @item pipe @tab X +@item Pro-MPEG FEC @tab X @item RTMP @tab X @item RTMPE @tab X @item RTMPS @tab X diff --git a/doc/protocols.texi b/doc/protocols.texi index a1084bd..7c19dd8 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -513,6 +513,44 @@ time, which is valuable if data transmission is slow. Note that some formats (typically MOV), require the output protocol to be seekable, so they will fail with the pipe output protocol. +@section prompeg + +Pro-MPEG Code of Practice #3 Release 2 FEC protocol. + +The Pro-MPEG CoP#3 FEC is a 2D parity-check forward error correction mechanism +for MPEG-2 Transport Streams sent over RTP. + +This protocol must be used in conjunction with the @code{rtp_mpegts} muxer and +the @code{rtp} protocol. + +The required syntax is: +@example +-f rtp_mpegts -fec prompeg=@var{option}=@var{val}... rtp://@var{hostname}:@var{port} +@end example + +The destination UDP ports are @code{port + 2} for the column FEC stream +and @code{port + 4} for the row FEC stream. + +This protocol accepts the following options: +@table @option + +@item l=@var{n} +The number of columns (4-20, LxD <= 100) + +@item d=@var{n} +The number of rows (4-20, LxD <= 100) + +@item ttl=@var{n} +Set the TTL (Time-To-Live) value (for multicast only). + +@end table + +Example usage: + +@example +-f rtp_mpegts -fec prompeg=l=8:d=4 rtp://@var{hostname}:@var{port} +@end example + @section rtmp Real-Time Messaging Protocol. diff --git a/libavformat/Makefile b/libavformat/Makefile index abfbc37..b1d6798 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -546,6 +546,7 @@ OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o OBJS-$(CONFIG_MMSH_PROTOCOL) += mmsh.o mms.o asf.o OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o +OBJS-$(CONFIG_PROMPEG_PROTOCOL) += prompeg.o OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPE_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPS_PROTOCOL) += rtmpproto.o rtmppkt.o diff --git a/libavformat/prompeg.c b/libavformat/prompeg.c new file mode 100644 index 0000000..08409d8 --- /dev/null +++ b/libavformat/prompeg.c @@ -0,0 +1,493 @@ +/* + * Pro-MPEG Code of Practice #3 Release 2 FEC + * Copyright (c) 2016 Mobibase, France (http://www.mobibase.com) + * + * 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 + */ + +/** + * @file + * Pro-MPEG Code of Practice #3 Release 2 FEC protocol + * @author Vlad Tarca <vlad.tarca(a)gmail.com> + */ + +/* + * Reminder: + + [RFC 2733] FEC Packet Structure + + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | RTP Header | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | FEC Header | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | FEC Payload | + | | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + + [RFC 3550] RTP header + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |V=2|P|X| CC |M| PT | sequence number | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | timestamp | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | synchronization source (SSRC) identifier | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ + | contributing source (CSRC) identifiers | + | .... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +[RFC 3550] RTP header extension (after CSRC) + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | defined by profile | length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | header extension | + | .... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +[Pro-MPEG COP3] FEC Header + + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | SNBase low bits | length recovery | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |E| PT recovery | mask | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | TS recovery | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |X|D|type |index| offset | NA |SNBase ext bits| + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + */ + +#include "libavutil/parseutils.h" +#include "libavutil/avstring.h" +#include "libavutil/opt.h" +#include "libavutil/random_seed.h" +#include "avformat.h" +#include "url.h" + +#define PROMPEG_RTP_PT 0x60 +#define PROMPEG_FEC_COL 0x0 +#define PROMPEG_FEC_ROW 0x1 + +typedef struct PrompegFec { + uint16_t sn; + uint32_t ts; + uint8_t *bitstring; +} PrompegFec; + +typedef struct PrompegContext { + const AVClass *class; + URLContext *fec_col_hd, *fec_row_hd; + PrompegFec **fec_buf, **fec_col_tmp, **fec_col, *fec_row; + int ttl; + uint8_t l, d; + uint8_t *rtp_buf; + uint16_t rtp_col_sn, rtp_row_sn; + int packet_size; + int packet_idx, packet_idx_max; + uint16_t length_recovery; + int bitstring_size; + int fec_buf_len; + int rtp_buf_size; + int init; + int first; +} PrompegContext; + +#define OFFSET(x) offsetof(PrompegContext, x) +#define E AV_OPT_FLAG_ENCODING_PARAM + +static const AVOption options[] = { + { "ttl", "Time to live (in milliseconds, multicast only)", OFFSET(ttl), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = E }, + { "l", "FEC L", OFFSET(l), AV_OPT_TYPE_INT, { .i64 = 5 }, 4, 20, .flags = E }, + { "d", "FEC D", OFFSET(d), AV_OPT_TYPE_INT, { .i64 = 5 }, 4, 20, .flags = E }, + { NULL } +}; + +static const AVClass prompeg_class = { + .class_name = "prompeg", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static void xor64(const uint8_t *in1, const uint8_t *in2, uint8_t *out, int size) { + const uint64_t *p1, *p2; + const uint8_t *q1, *q2; + uint64_t *px; + uint8_t *qx; + int i, n, s; + + n = size / sizeof (uint64_t); + s = n * sizeof (uint64_t); + + p1 = (uint64_t*) in1; + p2 = (uint64_t*) in2; + px = (uint64_t*) out; + + for (i = 0; i < n; i++) { + px[i] = p1[i] ^ p2[i]; + } + + if (s == size) + return; + + q1 = in1 + s; + q2 = in2 + s; + qx = out + s; + n = size - s; + + for (i = 0; i < n; i++) { + qx[i] = q1[i] ^ q2[i]; + } +} + +static inline uint32_t rtp_get_ts(const uint8_t *buf) { + return (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]; +} + +static inline uint16_t rtp_get_sn(const uint8_t *buf) { + return (buf[2] << 8) | buf[3]; +} + +static int prompeg_create_bitstring(URLContext *h, const uint8_t *buf, int size, + uint8_t **bitstring) { + PrompegContext *s = h->priv_data; + uint8_t *b; + + if (size < 12 || (buf[0] & 0xc0) != 0x80 || (buf[1] & 0x7f) != 0x21) { + av_log(h, AV_LOG_ERROR, "Unsupported stream format (expected MPEG-TS over RTP)\n"); + return AVERROR(EINVAL); + } + if (size != s->packet_size) { + av_log(h, AV_LOG_ERROR, "The RTP packet size must be constant (set pkt_size)\n"); + return AVERROR(EINVAL); + } + + *bitstring = av_malloc(s->bitstring_size); + if (!*bitstring) { + av_log(h, AV_LOG_ERROR, "Failed to allocate the bitstring buffer\n"); + return AVERROR(ENOMEM); + } + b = *bitstring; + + // P, X, CC + b[0] = buf[0] & 0x3f; + // M, PT + b[1] = buf[1]; + // Timestamp + b[2] = buf[4]; + b[3] = buf[5]; + b[4] = buf[6]; + b[5] = buf[7]; + /* + * length_recovery: the unsigned network-ordered sum of lengths of CSRC, + * padding, extension and media payload + */ + b[6] = s->length_recovery >> 8; + b[7] = s->length_recovery & 0xff; + + // Payload + memcpy(b + 8, buf + 12, s->length_recovery); + + return 0; +} + +static int prompeg_write_fec(URLContext *h, PrompegFec *fec, uint8_t type) { + PrompegContext *s = h->priv_data; + URLContext *hd; + uint8_t *buf = s->rtp_buf; // zero-filled + uint8_t *b = fec->bitstring; + uint16_t sn; + int ret; + + sn = type == PROMPEG_FEC_COL ? ++s->rtp_col_sn : ++s->rtp_row_sn; + + // V, P, X, CC + buf[0] = 0x80 | (b[0] & 0x3f); + // M, PT + buf[1] = (b[1] & 0x80) | PROMPEG_RTP_PT; + // SN + buf[2] = sn >> 8; + buf[3] = sn & 0xff; + // TS + buf[4] = (fec->ts >> 24) & 0xff; + buf[5] = (fec->ts >> 16) & 0xff; + buf[6] = (fec->ts >> 8) & 0xff; + buf[7] = fec->ts & 0xff; + // CSRC=0 + //buf[8] = 0x0; + //buf[9] = 0x0; + //buf[10] = 0x0; + //buf[11] = 0x0; + // SNBase low bits + buf[12] = fec->sn >> 8; + buf[13] = fec->sn & 0xff; + // Length recovery + buf[14] = b[6]; + buf[15] = b[7]; + // E=1, PT recovery + buf[16] = 0x80 | b[1]; + // Mask=0 + //buf[17] = 0x0; + //buf[18] = 0x0; + //buf[19] = 0x0; + // TS recovery + buf[20] = b[2]; + buf[21] = b[3]; + buf[22] = b[4]; + buf[23] = b[5]; + // X=0, D, type=0, index=0 + buf[24] = type == PROMPEG_FEC_COL ? 0x0 : 0x40; + // offset + buf[25] = type == PROMPEG_FEC_COL ? s->l : 0x1; + // NA + buf[26] = type == PROMPEG_FEC_COL ? s->d : s->l; + // SNBase ext bits=0 + //buf[27] = 0x0; + // Payload + memcpy(buf + 28, b + 8, s->length_recovery); + + hd = type == PROMPEG_FEC_COL ? s->fec_col_hd : s->fec_row_hd; + ret = ffurl_write(hd, buf, s->rtp_buf_size); + return ret; +} + +static int prompeg_open(URLContext *h, const char *uri, int flags) { + PrompegContext *s = h->priv_data; + AVDictionary *udp_opts = NULL; + int rtp_port; + char hostname[256]; + char buf[1024]; + + if (s->l * s->d > 100) { + av_log(h, AV_LOG_ERROR, "L * D must be <= 100\n"); + return AVERROR(EINVAL); + } + + av_log(h, AV_LOG_INFO, "ProMPEG CoP#3-R2 FEC L=%d D=%d\n", s->l, s->d); + + av_url_split(NULL, 0, NULL, 0, hostname, sizeof (hostname), &rtp_port, + NULL, 0, uri); + + if (s->ttl > 0) { + snprintf(buf, 256, "%d", s->ttl); + av_dict_set(&udp_opts, "ttl", buf, 0); + } + + ff_url_join(buf, sizeof (buf), "udp", NULL, hostname, rtp_port + 2, NULL); + if (ffurl_open_whitelist(&s->fec_col_hd, buf, flags, &h->interrupt_callback, + &udp_opts, h->protocol_whitelist, h->protocol_blacklist, h) < 0) + goto fail; + ff_url_join(buf, sizeof (buf), "udp", NULL, hostname, rtp_port + 4, NULL); + if (ffurl_open_whitelist(&s->fec_row_hd, buf, flags, &h->interrupt_callback, + &udp_opts, h->protocol_whitelist, h->protocol_blacklist, h) < 0) + goto fail; + + h->max_packet_size = s->fec_col_hd->max_packet_size; + s->init = 1; + + if (udp_opts) + av_dict_free(&udp_opts); + + return 0; + +fail: + if (s->fec_col_hd) + ffurl_close(s->fec_col_hd); + if (s->fec_row_hd) + ffurl_close(s->fec_row_hd); + if (udp_opts) + av_dict_free(&udp_opts); + return AVERROR(EIO); +} + +static int prompeg_init(URLContext *h, const uint8_t *buf, int size) { + PrompegContext *s = h->priv_data; + int i; + + s->packet_idx = 0; + s->packet_idx_max = s->l * s->d; + s->packet_size = size; + s->length_recovery = size - 12; + s->bitstring_size = (s->length_recovery + 8) * sizeof (uint8_t); + s->fec_buf_len = 1 + 2 * s->l; // row + column tmp + column out + s->rtp_buf_size = (12 + 16 + s->length_recovery) * sizeof (uint8_t); + s->fec_buf = NULL; + s->rtp_buf = NULL; + s->rtp_col_sn = av_get_random_seed() & 0x0fff; + s->rtp_row_sn = av_get_random_seed() & 0x0fff; + + s->fec_buf = av_malloc(s->fec_buf_len * sizeof (PrompegFec*)); + if (!s->fec_buf) { + goto fail; + } + for (i = 0; i < s->fec_buf_len; i++) { + s->fec_buf[i] = av_malloc(sizeof (PrompegFec)); + if (!s->fec_buf[i]) { + goto fail; + } + s->fec_buf[i]->bitstring = av_malloc(s->bitstring_size); + if (!s->fec_buf[i]->bitstring) { + av_free(s->fec_buf[i]); + s->fec_buf[i] = NULL; + goto fail; + } + } + s->fec_row = *s->fec_buf; + s->fec_col = s->fec_buf + 1; + s->fec_col_tmp = s->fec_buf + 1 + s->l; + + s->rtp_buf = av_malloc(s->rtp_buf_size); + if (!s->rtp_buf) { + goto fail; + } + memset(s->rtp_buf, 0, s->rtp_buf_size); + + s->init = 0; + s->first = 1; + + return 0; + +fail: + if (s->fec_buf) { + for (i = 0; i < s->fec_buf_len; i++) { + if (!s->fec_buf[i]) { + break; + } + av_free(s->fec_buf[i]->bitstring); + av_free(s->fec_buf[i]); + s->fec_buf[i] = NULL; + } + av_free(s->fec_buf); + s->fec_buf = NULL; + } + if (s->rtp_buf) { + av_free(s->rtp_buf); + s->rtp_buf = NULL; + } + + av_log(h, AV_LOG_ERROR, "Failed to allocate the FEC buffer\n"); + return AVERROR(ENOMEM); +} + +static int prompeg_write(URLContext *h, const uint8_t *buf, int size) { + PrompegContext *s = h->priv_data; + PrompegFec *fec_tmp; + uint8_t *bitstring = NULL; + int col_idx, col_out_idx, row_idx; + int ret; + + if (s->init && ((ret = prompeg_init(h, buf, size)) < 0)) + goto fail; + + if ((ret = prompeg_create_bitstring(h, buf, size, &bitstring)) < 0) + goto fail; + + col_idx = s->packet_idx % s->l; + row_idx = s->packet_idx / s->l % s->d; + + // FEC' (row) send block-aligned, xor + if (col_idx == 0) { + if (!s->first || s->packet_idx > 0) { + if ((ret = prompeg_write_fec(h, s->fec_row, PROMPEG_FEC_ROW)) < 0) + goto fail; + } + memcpy(s->fec_row->bitstring, bitstring, s->bitstring_size); + s->fec_row->sn = rtp_get_sn(buf); + s->fec_row->ts = rtp_get_ts(buf); + } else { + xor64(s->fec_row->bitstring, bitstring, s->fec_row->bitstring, + s->bitstring_size); + } + + // FEC (column) xor + if (row_idx == 0) { + if (!s->first) { + // swap fec_col and fec_col_tmp + fec_tmp = s->fec_col[col_idx]; + s->fec_col[col_idx] = s->fec_col_tmp[col_idx]; + s->fec_col_tmp[col_idx] = fec_tmp; + } + memcpy(s->fec_col_tmp[col_idx]->bitstring, bitstring, s->bitstring_size); + s->fec_col_tmp[col_idx]->sn = rtp_get_sn(buf); + s->fec_col_tmp[col_idx]->ts = rtp_get_ts(buf); + } else { + xor64(s->fec_col_tmp[col_idx]->bitstring, bitstring, + s->fec_col_tmp[col_idx]->bitstring, s->bitstring_size); + } + + // FEC (column) send block-aligned + if (!s->first && s->packet_idx % s->d == 0) { + col_out_idx = s->packet_idx / s->l; + if ((ret = prompeg_write_fec(h, s->fec_col[col_out_idx], PROMPEG_FEC_COL)) < 0) + goto fail; + } + + if (++s->packet_idx >= s->packet_idx_max) { + s->packet_idx = 0; + if (s->first) + s->first = 0; + } + + av_free(bitstring); + + return 0; + +fail: + if (bitstring) + av_free(bitstring); + + return ret; +} + +static int prompeg_close(URLContext *h) { + PrompegContext *s = h->priv_data; + int i; + + ffurl_close(s->fec_col_hd); + ffurl_close(s->fec_row_hd); + + if (s->fec_buf) { + for (i = 0; i < s->fec_buf_len; i++) { + av_free(s->fec_buf[i]->bitstring); + av_free(s->fec_buf[i]); + } + av_free(s->fec_buf); + } + if (s->rtp_buf) + av_free(s->rtp_buf); + + return 0; +} + +const URLProtocol ff_prompeg_protocol = { + .name = "prompeg", + .url_open = prompeg_open, + .url_write = prompeg_write, + .url_close = prompeg_close, + .priv_data_size = sizeof(PrompegContext), + .flags = URL_PROTOCOL_FLAG_NETWORK, + .priv_data_class = &prompeg_class, +}; diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 124010c..77bb327 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -43,6 +43,7 @@ extern const URLProtocol ff_mmsh_protocol; extern const URLProtocol ff_mmst_protocol; extern const URLProtocol ff_md5_protocol; extern const URLProtocol ff_pipe_protocol; +extern const URLProtocol ff_prompeg_protocol; extern const URLProtocol ff_rtmp_protocol; extern const URLProtocol ff_rtmpe_protocol; extern const URLProtocol ff_rtmps_protocol; diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index fa1dcb5..7e9324b 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -44,7 +44,7 @@ typedef struct RTPContext { const AVClass *class; - URLContext *rtp_hd, *rtcp_hd; + URLContext *rtp_hd, *rtcp_hd, *fec_hd; int rtp_fd, rtcp_fd, nb_ssm_include_addrs, nb_ssm_exclude_addrs; struct sockaddr_storage **ssm_include_addrs, **ssm_exclude_addrs; int write_to_source; @@ -58,6 +58,8 @@ typedef struct RTPContext { int dscp; char *sources; char *block; + char *fec_options_str; + int fec; } RTPContext; #define OFFSET(x) offsetof(RTPContext, x) @@ -75,6 +77,7 @@ static const AVOption options[] = { { "dscp", "DSCP class", OFFSET(dscp), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "sources", "Source list", OFFSET(sources), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, { "block", "Block list", OFFSET(block), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, + { "fec", "FEC", OFFSET(fec_options_str), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = E }, { NULL } }; @@ -316,9 +319,11 @@ static void rtp_parse_addr_list(URLContext *h, char *buf, static int rtp_open(URLContext *h, const char *uri, int flags) { RTPContext *s = h->priv_data; + AVDictionary *fec_opts = NULL; int rtp_port; char hostname[256], include_sources[1024] = "", exclude_sources[1024] = ""; char *sources = include_sources, *block = exclude_sources; + char *fec_protocol = NULL; char buf[1024]; char path[1024]; const char *p; @@ -377,6 +382,33 @@ static int rtp_open(URLContext *h, const char *uri, int flags) } } + if (s->fec_options_str) { + p = s->fec_options_str; + + if (!(fec_protocol = av_get_token(&p, "="))) { + av_log(h, AV_LOG_FATAL, "Failed to parse the FEC protocol value\n"); + goto fail; + } + if (strcmp(fec_protocol, "prompeg")) { + av_log(h, AV_LOG_FATAL, "Unsupported FEC protocol %s\n", fec_protocol); + goto fail; + } + + p = s->fec_options_str + strlen(fec_protocol); + while (*p && *p == '=') p++; + + if (av_dict_parse_string(&fec_opts, p, "=", ":", 0) < 0) { + av_log(h, AV_LOG_FATAL, "Failed to parse the FEC options\n"); + goto fail; + } + if (s->ttl > 0) { + snprintf(buf, 256, "%d", s->ttl); + av_dict_set(&fec_opts, "ttl", buf, 0); + } + + s->fec = 1; + } + for (i = 0; i < max_retry_count; i++) { build_udp_url(s, buf, sizeof(buf), hostname, rtp_port, s->local_rtpport, @@ -390,6 +422,12 @@ static int rtp_open(URLContext *h, const char *uri, int flags) continue; } rtcpflags = flags | AVIO_FLAG_WRITE; + if (s->fec) { + ff_url_join(buf, sizeof(buf), fec_protocol, NULL, hostname, rtp_port, NULL); + if (ffurl_open_whitelist(&s->fec_hd, buf, flags, &h->interrupt_callback, + &fec_opts, h->protocol_whitelist, h->protocol_blacklist, h) < 0) + goto fail; + } if (s->local_rtcpport < 0) { s->local_rtcpport = s->local_rtpport + 1; build_udp_url(s, buf, sizeof(buf), @@ -419,6 +457,12 @@ static int rtp_open(URLContext *h, const char *uri, int flags) h->max_packet_size = s->rtp_hd->max_packet_size; h->is_streamed = 1; + + if (fec_protocol) + av_free(fec_protocol); + if (fec_opts) + av_dict_free(&fec_opts); + return 0; fail: @@ -426,6 +470,10 @@ static int rtp_open(URLContext *h, const char *uri, int flags) ffurl_close(s->rtp_hd); if (s->rtcp_hd) ffurl_close(s->rtcp_hd); + if (fec_protocol) + av_free(fec_protocol); + if (fec_opts) + av_dict_free(&fec_opts); return AVERROR(EIO); } @@ -543,7 +591,14 @@ static int rtp_write(URLContext *h, const uint8_t *buf, int size) hd = s->rtp_hd; } - ret = ffurl_write(hd, buf, size); + if ((ret = ffurl_write(hd, buf, size)) < 0) { + return ret; + } + + if (s->fec && !RTP_PT_IS_RTCP(buf[1])) { + ret = ffurl_write(s->fec_hd, buf, size); + } + return ret; } @@ -561,6 +616,9 @@ static int rtp_close(URLContext *h) ffurl_close(s->rtp_hd); ffurl_close(s->rtcp_hd); + if (s->fec) { + ffurl_close(s->fec_hd); + } return 0; } -- 2.7.4

3 14