From patchwork Wed Jun 28 12:06:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ffmpeg@a.legko.ru X-Patchwork-Id: 4144 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp3217409vsb; Wed, 28 Jun 2017 05:06:20 -0700 (PDT) X-Received: by 10.223.166.139 with SMTP id t11mr18069714wrc.39.1498651580802; Wed, 28 Jun 2017 05:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498651580; cv=none; d=google.com; s=arc-20160816; b=aaJj+1CPMvxdy6BmOYeg1IUZw9LzJjVF1mcLxzMpYI4EV5/xTN6A/AQjojg8g285Ee RulisRhJqmJttxhyQ9EeYQmDJziJWSkok5FqU5rwGc4zNDswM/bBRMTamD9KwzbX1Syh e2s3UxGPz7kGJEZJI+jXV2+32s8B6O6VUh8euyScG7hqHJskgCAAH9fEIym2oR1h1+6N TO8p2NZBCOkOLICMEvDqcSbG87irINdCNM1dBQI/Lrn9Ee5tXZx6OINIQEY8bW/CVGrB gZIdUzidCrPPjvJ3JYPPI+RoKvmHusM661Nb3/XEsIddFS6RQu8Z1jYHt+lgG6YO7DyA 06Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:user-agent:message-id:to:from:date:delivered-to :arc-authentication-results; bh=QbuXV4gUqaXi8ay2YIFYSlDun19Sclv4Kw9wKbyD/LU=; b=HkfmqnwX6Hj/EESujDVSb8H+WMad9i5AqVNWfvE1BvFUdAGXkGe2LRO3NP6b6H15gx BOs7dnvOGj0N9me95412uHBsqRDPzT3KO74C2Ezuh4swhfrs8kbQmhK2NH59ajsMMhiu WVT0puw5VA8NK5fJU29Sqr/u/eHsPos255yebsyns5KUnX/1C5DJqLiPyJuqfK/Ow/PB k6tedsC9h/Nk54e5yuVi0dokiyioPz1GX2E5NcXiClvnLVbPn+Vf+wNRbhXyHHDgok5L HvvVF5JnVlAfMYymC1hiWSO3GsmcF/TBYlZXlrTmQkJrEP2RVMzdSJxeXZ+g59vGeMsM XFFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e13si1694820wre.332.2017.06.28.05.06.20; Wed, 28 Jun 2017 05:06:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A37668A249; Wed, 28 Jun 2017 15:06:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from scil.sinp.msu.ru (scil.sinp.msu.ru [213.131.0.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31B4D68A1C4 for ; Wed, 28 Jun 2017 15:06:10 +0300 (EEST) Received: from ffmpeg (helo=localhost) by scil.sinp.msu.ru with local-esmtp (Exim 4.86) (envelope-from ) id 1dQBjW-00074U-NS for ffmpeg-devel@ffmpeg.org; Wed, 28 Jun 2017 15:06:11 +0300 Date: Wed, 28 Jun 2017 15:06:10 +0300 (MSK) From: ffmpeg@a.legko.ru X-X-Sender: ffmpeg@scil.sinp.msu.ru To: FFmpeg development discussions and patches Message-ID: User-Agent: Alpine 2.20 (LNX 67 2015-01-07) MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "scil.sinp.msu.ru", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see vvs for details. Content preview: subject: some options, present in libavformat/mpegtsenc.c were not present in ffmpeg_ops.c, thus filling some values in mpeg ts with default values. it is not good for ts itself and breaks mutltiprog/multistream mode. [...] Content analysis details: (0.0 points, 6.5 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 NO_RELAYS Informational: message was not relayed via SMTP Subject: [FFmpeg-devel] patch 2. Adding missing options, required for mpegts encoder. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" subject: some options, present in libavformat/mpegtsenc.c were not present in ffmpeg_ops.c, thus filling some values in mpeg ts with default values. it is not good for ts itself and breaks mutltiprog/multistream mode. From 79cb812cd708aa3d9d1a90eec6f42317b23ef05b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Jun 2017 14:55:08 +0300 Subject: [PATCH 2/3] add support for missing options, required by libavformat/mpegtsenc.c and present there, but never defined --- ffmpeg_opt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index bb6001f..aa4ffb5 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2653,13 +2653,18 @@ loop_end: if (!*p2) exit_program(1); p2++; - if (!strcmp(key, "title")) { av_dict_set(&program->metadata, "title", p2, 0); } else if (!strcmp(key, "program_num")) { } else if (!strcmp(key, "st")) { int st_num = strtol(p2, NULL, 0); av_program_add_stream_index(oc, progid, st_num); + } else if (!strcmp(key, "service_provider")) { + av_dict_set(&program->metadata, "service_provider", p2, 0); + } else if (!strcmp(key, "service_name")) { + av_dict_set(&program->metadata, "service_name", p2, 0); + } else if (!strcmp(key, "pcr_pid")) { + av_dict_set(&program->metadata, "pcr_pid", p2, 0); } else { av_log(NULL, AV_LOG_FATAL, "Unknown program key %s.\n", key); exit_program(1);