From patchwork Mon Jun 29 17:33:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20700 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E2BCF4483D1 for ; Mon, 29 Jun 2020 20:33:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBAAC68805C; Mon, 29 Jun 2020 20:33:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C6646804E8 for ; Mon, 29 Jun 2020 20:33:17 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id ga4so17400643ejb.11 for ; Mon, 29 Jun 2020 10:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oprRLtQP6ZihTQGf3Pjab7UVAKTQxg2NPMK+Qky0+w4=; b=I6cQGoqr/r83wpSssHMmJa8/a4+mh4jZpxue7XWYmdTrDysNgvBxENW3Z9MZFdxvPS +iW8VSxiOt7ujBd2JZxMmdQCwzXQWLS+o4ccBrL/HAwrLbbPx4WfG+jCpXFAxztCntgV ufL7piAeJXCLEPFsUeweloP5TQXFcgZjDyB+XXfBHPanmFkcgQLyQwAiP8XkC+09AiYW vFRdf6nSGYSB6qxe/5M4huJ4keydTgIDECyfNytXHDm+z06k2uHwffVqe+PFvBxTDS87 u/CC5DesRloaXBDF4ovwcXEKaTlZilqRUsN/1kBUZpyDAFMlkQUkS03lVbE/H05rjzID hKJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oprRLtQP6ZihTQGf3Pjab7UVAKTQxg2NPMK+Qky0+w4=; b=BbpPsxH7JvSlqQ/rf4pUhM8YVzIxTcUf2TUJ1tEbCIfYPtgiJ131Q10mbHXwJxAgLu gK1zwNwZax6hFj1KsE4WZA64Q9S0Scj6In6NnkhplCuwp9MDdlGO6uboeNKPHDUo5ece VRXplGfRQI3P3XhOQyF+5jWelGZA3v3wznrlLonqPvtsrIAfORAp7xePKlQJB40Wvxzp PYW2ism1IYkXMiNczRBzQnUlicZ8tkh3728Km0ytbGfsSa0agvCGzQpAJcKwG/Wn1Cyo cyUVzMC8fQmzLuNpx0tEsnLZeouZixOUrtRGCD3PYNhdBO8KWWLfKlgEgmbgpH25kZZ4 309w== X-Gm-Message-State: AOAM530XFn8P1V1Plkq7adJZtkrRdgeXYRUhGDiDfx8rDpIkqsysnQDS fiGRzV2OUPSzNEMdkeLjcIT0rqAr X-Google-Smtp-Source: ABdhPJydla7SMXda5YB9Ic2jjJtWBi0T11nJA1fS8/QmCpfO7z46/XBZMkQ2Yr/nF3urBpAmqPyYmA== X-Received: by 2002:a17:906:1499:: with SMTP id x25mr14651062ejc.406.1593451996397; Mon, 29 Jun 2020 10:33:16 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id i7sm332844eds.91.2020.06.29.10.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 10:33:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 19:33:07 +0200 Message-Id: <20200629173309.4871-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] fate: Update fate refs after cca982ee018aad54214e94f2a0a5921c8bbf1328 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- I am not sure know whether cca982ee018aad54214e94f2a0a5921c8bbf1328 is correct or whether it should be reverted. tests/ref/fate/filter-colorbalance | 6 +++--- tests/ref/fate/filter-colorbalance-gbrap | 6 +++--- tests/ref/fate/filter-colorbalance-gbrap-16 | 6 +++--- tests/ref/fate/filter-colorbalance-rgba64 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/ref/fate/filter-colorbalance b/tests/ref/fate/filter-colorbalance index 0be1f1c855..f267da572e 100644 --- a/tests/ref/fate/filter-colorbalance +++ b/tests/ref/fate/filter-colorbalance @@ -3,6 +3,6 @@ #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 1, 304128, 0x3451c8eb -0, 1, 1, 1, 304128, 0x2107daa0 -0, 2, 2, 1, 304128, 0xcda7aa33 +0, 0, 0, 1, 304128, 0xd50c9fea +0, 1, 1, 1, 304128, 0xdf9e1f79 +0, 2, 2, 1, 304128, 0x9b84087e diff --git a/tests/ref/fate/filter-colorbalance-gbrap b/tests/ref/fate/filter-colorbalance-gbrap index 2e99601829..a85dc388b0 100644 --- a/tests/ref/fate/filter-colorbalance-gbrap +++ b/tests/ref/fate/filter-colorbalance-gbrap @@ -3,6 +3,6 @@ #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 1, 405504, 0xad0f2d82 -0, 1, 1, 1, 405504, 0x81d7d31f -0, 2, 2, 1, 405504, 0x40c5e836 +0, 0, 0, 1, 405504, 0xd33217e5 +0, 1, 1, 1, 405504, 0x08f161af +0, 2, 2, 1, 405504, 0x27508654 diff --git a/tests/ref/fate/filter-colorbalance-gbrap-16 b/tests/ref/fate/filter-colorbalance-gbrap-16 index 4ce323557b..d18fe5a466 100644 --- a/tests/ref/fate/filter-colorbalance-gbrap-16 +++ b/tests/ref/fate/filter-colorbalance-gbrap-16 @@ -3,6 +3,6 @@ #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 1, 405504, 0xa97c136c -0, 1, 1, 1, 405504, 0x0a120697 -0, 2, 2, 1, 405504, 0x85b133ff +0, 0, 0, 1, 405504, 0x2e44c4b0 +0, 1, 1, 1, 405504, 0xf47244e0 +0, 2, 2, 1, 405504, 0x040769dd diff --git a/tests/ref/fate/filter-colorbalance-rgba64 b/tests/ref/fate/filter-colorbalance-rgba64 index f6fcfee250..254669ff88 100644 --- a/tests/ref/fate/filter-colorbalance-rgba64 +++ b/tests/ref/fate/filter-colorbalance-rgba64 @@ -3,6 +3,6 @@ #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 1, 811008, 0xa67db91d -0, 1, 1, 1, 811008, 0x0846578a -0, 2, 2, 1, 811008, 0x77af61f8 +0, 0, 0, 1, 811008, 0x42e5db8b +0, 1, 1, 1, 811008, 0x31be5974 +0, 2, 2, 1, 811008, 0xdef21287 From patchwork Mon Jun 29 17:33:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20701 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D24D54483D1 for ; Mon, 29 Jun 2020 20:33:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB904688074; Mon, 29 Jun 2020 20:33:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABFBC680A07 for ; Mon, 29 Jun 2020 20:33:37 +0300 (EEST) Received: by mail-ed1-f65.google.com with SMTP id e22so13538969edq.8 for ; Mon, 29 Jun 2020 10:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dp1pDGFf5lSiPjYhsSNAhlMLdqaFMOhmedZevYCgmKk=; b=hcAqEIOA702TYbdVKr+6dcC0rGyoxcymXy2/hDZUbUXLF4cslsTrOdOhH7sBxpuXXi NQvXABIbQ4WyHJOiyMitYMifXtz4PfHgOeNIyRc2INuz31JjyPqzZEbosfnO9TduDEQO kC7f9K5VbjEKIbHHtADQVAlUQ3WJfiSEOA4csKEiIsu4CLZGMhlaFf/ufF3FooWyHYw/ OKk/TvWCO6l5AIx6GpZA7kwNHad7kdeRBbzQRgB83z6dfyr9wjfJxdS4t/9GNGDBiBo5 2u13yjoMNGqbWdP924ZrQe0eJZiQ3X4w3TQMtO598GmOxofBcFw3lDI5q7fJG+R1c/1m N+LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dp1pDGFf5lSiPjYhsSNAhlMLdqaFMOhmedZevYCgmKk=; b=cBheokOMMbp8DxnM3k9nB621HlfIx/u57Ng+7mQv3k0bSPOrVz8Ym117h/xjW0iBtf ZYc+PP5cCZPuGXBUQ6xKPRkxhyisJcfBurCIEo4oEmKbFxaAK/BA8LnoBxn/Wwv50ylG GHq+rLroOrPs6+EYcI+IQQuex244QHRojLexixdWzjMR3gxF6MWxgI6N8h4xjdqcXfbu N1cpy+W0aZ7hxSYs4oebeCX246k1ZY1Ub48gLaV1op+SwFGBdRpqqLga+EgJ/TIda7nV o5eD3cAvQXIzoyheGxzhbLrhOEGhSai99YPG6nkgJ6JTVYOSiB73iSsp8jB5zTpNwms9 acvg== X-Gm-Message-State: AOAM533SdieJKFpxl6ZfpKOW0ZMfgTvbgF/rv2jH+S5L0waJln2I0cJO fxTFA7nXv+uFNzdKUYdacSJXC1/o X-Google-Smtp-Source: ABdhPJyi5MHkOd7toZkweGDS7Q8gfnhOtxQ6NJb09oWBrDcT8caiq5KffzMzn/2PsxUckCFdjOlGSw== X-Received: by 2002:a05:6402:319b:: with SMTP id di27mr19094535edb.133.1593452016839; Mon, 29 Jun 2020 10:33:36 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id i7sm332844eds.91.2020.06.29.10.33.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 10:33:36 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 19:33:08 +0200 Message-Id: <20200629173309.4871-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200629173309.4871-1-andreas.rheinhardt@gmail.com> References: <20200629173309.4871-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/dvbsub_parser: Don't allocate buffer separately 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/dvbsub_parser.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index 8ced3c4c34..b7a3d6154c 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -35,20 +35,12 @@ /* parser definition */ typedef struct DVBSubParseContext { - uint8_t *packet_buf; int packet_start; int packet_index; int in_packet; + uint8_t packet_buf[PARSE_BUF_SIZE]; } DVBSubParseContext; -static av_cold int dvbsub_parse_init(AVCodecParserContext *s) -{ - DVBSubParseContext *pc = s->priv_data; - pc->packet_buf = av_malloc(PARSE_BUF_SIZE); - - return 0; -} - static int dvbsub_parse(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, @@ -173,16 +165,8 @@ static int dvbsub_parse(AVCodecParserContext *s, return buf_size; } -static av_cold void dvbsub_parse_close(AVCodecParserContext *s) -{ - DVBSubParseContext *pc = s->priv_data; - av_freep(&pc->packet_buf); -} - AVCodecParser ff_dvbsub_parser = { .codec_ids = { AV_CODEC_ID_DVB_SUBTITLE }, .priv_data_size = sizeof(DVBSubParseContext), - .parser_init = dvbsub_parse_init, .parser_parse = dvbsub_parse, - .parser_close = dvbsub_parse_close, }; From patchwork Mon Jun 29 17:33:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20702 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D2EEB4483D1 for ; Mon, 29 Jun 2020 20:33:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AEE946880A6; Mon, 29 Jun 2020 20:33:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C0B36880A4 for ; Mon, 29 Jun 2020 20:33:39 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id a1so17412588ejg.12 for ; Mon, 29 Jun 2020 10:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EfwMndjO6+0+AL+mZL0FQIWMER7U8Kb10LnJgsei55I=; b=r5Lv2gNT1PDkzPwYY36CUfMYIHpkuz913h/VvLYNDANjUp1gCVYwd15G6P4V4sfKq9 OG0sIPG649EwTAb7Xy7IurSVYJqiMlNtrEeRqIs7f7DWNqkBTQ0Cv2Oc7cQ2L4yRkYEX au9TJtCzmRJXEQsg+IeBMjBt3plBL1bY39Z2rIu+s9KSXGM45+l22GIXe1ig+jiczCMt WtQF84kSfnTFsry82qadmHz/EJZFfXcYcHylLeE4Fp5NA8nuQ71uskhe0oEoJS/CL0TI o1/+TqXhZGoDzY9Sy9+45YMKst+WtNYz+X7CyN+Z40yQ9cOp4GXbhjKAQPxsTyoKhGDR kbjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EfwMndjO6+0+AL+mZL0FQIWMER7U8Kb10LnJgsei55I=; b=gF+s/5RiFOSV/BCTSev0ocVcaKb3tMT2h1vrjxFsRzwZ4QG97rIz5wnITuTsGfI6WD 9CzZR+Wq5/CnPwSUB2kOkb84NNcUrbDk1US9/rUbXna300lKpWhscFEPXvAD+N4zKJlx 6uPxV3/XI/IhHBFSTpRKarQVsB/R9cJzYigd2G2UBnu8etZvjMewW5jpFfjrFJP7xDQ8 RH20X5NIWQ8jzamDDXRyZszZYDAqG7UuaMZoM5XvdCJ/9p55WgRXGZQIwtqhj5PbHRDu oFHn5Wg8J5u/uuD55WqN8kHpoWBcsjAECSYPAJDUvOvleqafLamdmCBPa/u+Sl1CbWZj t/Ew== X-Gm-Message-State: AOAM531R02+b/vlXVmQaMjZiShitNPVqoNVnjv1G4MOTDEAtvk+z4W4p QBBKA8qoqvMiQT50TQdsG3q6Weq3 X-Google-Smtp-Source: ABdhPJwHmJfP9apowXf+B/XMQRUGbXESoBqDOp9fsCmwuPVd/9zMgNyvb/aNmTT53r2ZTUFrYsTLcg== X-Received: by 2002:a17:906:444e:: with SMTP id i14mr2944199ejp.418.1593452017960; Mon, 29 Jun 2020 10:33:37 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id i7sm332844eds.91.2020.06.29.10.33.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 10:33:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 19:33:09 +0200 Message-Id: <20200629173309.4871-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200629173309.4871-1-andreas.rheinhardt@gmail.com> References: <20200629173309.4871-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/dvdsub_parser: Remove empty init function 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/dvdsub_parser.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c index 698ccb6987..054af69db9 100644 --- a/libavcodec/dvdsub_parser.c +++ b/libavcodec/dvdsub_parser.c @@ -32,11 +32,6 @@ typedef struct DVDSubParseContext { int packet_index; } DVDSubParseContext; -static av_cold int dvdsub_parse_init(AVCodecParserContext *s) -{ - return 0; -} - static int dvdsub_parse(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, @@ -92,7 +87,6 @@ static av_cold void dvdsub_parse_close(AVCodecParserContext *s) AVCodecParser ff_dvdsub_parser = { .codec_ids = { AV_CODEC_ID_DVD_SUBTITLE }, .priv_data_size = sizeof(DVDSubParseContext), - .parser_init = dvdsub_parse_init, .parser_parse = dvdsub_parse, .parser_close = dvdsub_parse_close, };