From patchwork Sun Jun 10 15:00:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 9357 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp3115889jad; Sun, 10 Jun 2018 08:06:50 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIzqTLd4T6A595jaqQQFrKRhC1Uw+DGdloWMWtyEGIZJxyzHcqsEzEw/+71EHCHaZx/+GfU X-Received: by 2002:a1c:d11:: with SMTP id 17-v6mr5849426wmn.81.1528643210380; Sun, 10 Jun 2018 08:06:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528643210; cv=none; d=google.com; s=arc-20160816; b=xEGmDWLU1JHHAcdFWRy1pd8Es0V0pvkZXTjadWYEGoXQGFYOluglOsYTn5krcx3xb+ G2pjk3hFwvHUOGkV/R7sVXe1zGaXG9P7bIU9quvzRbp46LKn8DV2aJTEzJYAv/bTdjuS vwaGczgujvB02DGCqfA9E+NFYcN6FSLGhvdhNbyBGEIwE2E1+5UGIqOlAtrG7G4UppIa qNsIEx7iLCl34HoIMczdsqbR0eZCOfXFhx+/3E6nfQzenAuw9YeGqvi264s6nGb0HDTC U8td9f6osBSnes46xqEPkdW7VW1YDcNAuzoIdG/0eTb39B4UUz5cQQF3hALUSCVFYvtN f8xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=1SpgpffsLtpMRObtpB2vZA+u737kxwb3FcOAgGgABhI=; b=AiTQwk9FZufU1X5yMfYd2n+cR/RjRSAKVrmBNKOqhoIFsACZb4XzJ81Coesmg/2i8j WiNXGrrPzLgU1JjtXBWL5QPV+GRQIwrl8htE3EWXEIwe6q++TOPe7BDyFD9fnI8XSLD/ gV9RY2OFY700URoSnAuT9ybxVSfty8B+XoRF07dEd3/XaWtlHQcRhttiu+hOc8Uzq39y Xy4FU3a/YLv1OdZHzvd7xeQ2ESv8NMKCsD+ECmp2KgGx5L1iWks2CXJiKH5Kf+mTESLP JsEUyE7iYUC9DgD8NRtFxhzUwPGIrzsd8mAcMK9j2n2xJ80fh8VHjbcu55+7QlRdgmC1 5Gvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="Ox/8TYb1"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g203-v6si4652837wmd.78.2018.06.10.08.06.49; Sun, 10 Jun 2018 08:06:50 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="Ox/8TYb1"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5887E68A439; Sun, 10 Jun 2018 18:05:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2D69680841 for ; Sun, 10 Jun 2018 18:05:51 +0300 (EEST) Received: by mail-pf0-f196.google.com with SMTP id z24-v6so8918265pfe.7 for ; Sun, 10 Jun 2018 08:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=qDP87UYN3xOfcOFpPTTI0a51MFLIqZvbtdq51QU5RPo=; b=Ox/8TYb1TYvYsj4YicKO1tGvRXWLuWqdpD/44ixfB+rTbsPe3Gxt+Zx3Yl1CnQBVJf 5ZNpr1I8CWht65TV5bzw4KNGwCWcBWSL6U6PFOmr8lRZFXZZpX5iCn9mdEp8WEv1eHe8 5KzcHR+3eIoG7/nDORnKfhzytoIfRPWEtF0FUCU1ERy2yR35vXV20RHgUGv0ggcnRqGn Y9kbleU4Qy/YZS1N9K13zXdzv6berw8V3G4bOZhY78QQuKnrxLj6y+/5Hvi7rnGEzYAm ej2CcJ6nCPK9EPwtZxdbu9tJcS5ExFACM64C2pWWlGa+REzL6HgY3eEICf95tQZrLanI zxnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=qDP87UYN3xOfcOFpPTTI0a51MFLIqZvbtdq51QU5RPo=; b=hC28NbodfO+nwmCwCw6oKRFKMgn0lzAc+4FPdUCRn3Mu4BatzovOagYlJTH7k0RAz9 D1IbzflEBqDRbbKDawvBEygGTCQh9vashlLbhOwdRV2rqyn308BZAoNbVOqh+h28A3W6 Lzo006Nc3Y0poU3IuwWBkJuWeqhHgS8kQhVj+54NBLiz3p6lWcRb6Ir1byEhNn+WvaGJ 4AcW4eTOqU5nv2j3FLNFtGGRVGNiEpAGHYLxu7vcmo8ccKluL9x25NsHAPdjiN7UpzOM IDRVkIyPThQ3zRIZsHEYa2S5hDn5e20ngC9XXGr0/3Dv7R7IDkDZPmnEJfebJTuoZ5VX gVIg== X-Gm-Message-State: APt69E2FIQbwFVFUg6Jte+1C2N4tz+SVDxfIvDg9jf/jDwEiYCrSOaBe MoujBTscIP6ztr2tDdZDaw2U+Qv9 X-Received: by 2002:a62:f0d:: with SMTP id x13-v6mr13973469pfi.100.1528642830525; Sun, 10 Jun 2018 08:00:30 -0700 (PDT) Received: from [192.168.1.225] ([103.206.133.143]) by smtp.gmail.com with ESMTPSA id v27-v6sm22942893pfi.23.2018.06.10.08.00.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jun 2018 08:00:29 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <225ab88a-809e-2d58-0c19-3922d49054c0@gmail.com> Date: Sun, 10 Jun 2018 20:30:26 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename="0001-avformat-remove-unused-MP4A_LATM-flag.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avformat: remove unused MP4A_LATM flag 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" From 5d3ab077f46fe14eaf5aa1246f975d847cf85e29 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sun, 10 Jun 2018 20:18:10 +0530 Subject: [PATCH] avformat: remove unused MP4A_LATM flag A generic lavf option for AAC LATM packetization for the RTP muxer was added in ef409645f0 and then made inert 20 days later in 0832122880 when a private muxer option was added and the generic flag no longer read. --- doc/formats.texi | 2 -- libavformat/avformat.h | 1 - libavformat/options_table.h | 1 - libavformat/rtpenc_chain.c | 2 +- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/formats.texi b/doc/formats.texi index ddd7743548..e29bc501c3 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -53,8 +53,6 @@ Discard corrupted frames. Try to interleave output packets by DTS. @item keepside Do not merge side data. -@item latm -Enable RTP MP4A-LATM payload. @item nobuffer Reduce the latency introduced by optional buffering @item bitexact diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ade918f99c..875e20e8c4 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1483,7 +1483,6 @@ typedef struct AVFormatContext { * This flag is mainly intended for testing. */ #define AVFMT_FLAG_BITEXACT 0x0400 -#define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Enable RTP MP4A-LATM payload #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted) #if FF_API_LAVF_KEEPSIDE_FLAG diff --git a/libavformat/options_table.h b/libavformat/options_table.h index b7a5b3c054..fc6ba4387d 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -52,7 +52,6 @@ static const AVOption avformat_options[] = { {"keepside", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, #endif {"fastseek", "fast but inaccurate seeks", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FAST_SEEK }, INT_MIN, INT_MAX, D, "fflags"}, -{"latm", "enable RTP MP4A-LATM payload", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, {"shortest", "stop muxing with the shortest stream", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_SHORTEST }, 0, 0, E, "fflags" }, diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index e69fdc27cf..d3c1bc96dc 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -58,7 +58,7 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s, rtpctx->max_delay = s->max_delay; /* Copy other stream parameters. */ rtpctx->streams[0]->sample_aspect_ratio = st->sample_aspect_ratio; - rtpctx->flags |= s->flags & (AVFMT_FLAG_MP4A_LATM | AVFMT_FLAG_BITEXACT); + rtpctx->flags |= s->flags & AVFMT_FLAG_BITEXACT; /* Get the payload type from the codec */ if (st->id < RTP_PT_PRIVATE)