From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CEB3E4319A for ; Thu, 23 Jun 2022 17:07:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BFD968B2F5; Thu, 23 Jun 2022 20:07:14 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065078.outbound.protection.outlook.com [40.92.65.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C97CB68B2F5 for ; Thu, 23 Jun 2022 20:07:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7rPYdNjOde+R/ycvvfl67yW4wgmUfapOT86zD2FTrX7qxYcYwfmFp4jUrhsEpQu11aHbKLCmekUFhTJKfEM5sMtDFFg35l0GYp8CxIaWGSovBgqGFXLcevvyRuXTztHapuHltIeaqqxQQX1NxSrd2oGkNjZtTJxTnvzgJhu+OcArwgLXJR1Io8yZWfsG8wuN5nox3aVIzMR1jrUI14TH00UGliI7pGpKobl0qXK7kLhzmx8LSUkiGyrcncAli62cz88v4eiRoCSMpFycWHRWQ2AcTFknvyj3cgp7j8D8oNnXHoduk3yT5eJtF8ScC8lxWMl/jWbAl45j2XmmYoO2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=i2LEejxzditVgTrD7YKxdDNLSpUdLRxDEYkyvAbpvTQ=; b=BtcD+4LTFn7WrV6BIazr73S4QNmq4B0X28djLhZrLtA9vsyQfNze2ie1Uwbr/Maseh4PZPwjG9h08eG3v56VYHc908Nx2pk5PHdemR11Sfdb5AV3z6FSsDXoUYe2TlDulq/qpzrHDrrC+oFOQVCXhZtLT5UtNJM9hR1gqW8RZMjA+5itz27Reyuhq1uKQv+ES72XjJIhWF98ALb5NMEca3JY97UlyOLHQicrRoMC36/oBS1NTMxR80xeQxhq4y8A4W2rE3DnWkilJEBqRm6lYoFnFgLV0bFkUyWJFX0ds8iY+Yt/AUrlKlqBut5tTETxw8PdAUIZpz6wJJfZtmHk7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i2LEejxzditVgTrD7YKxdDNLSpUdLRxDEYkyvAbpvTQ=; b=fZBwrNis5/VUMnw+87KMXFVnety/izekrQUXK1XdEYNxzFKvnre/ZxxESNuc1Ee4Sa7ZyXYOPlZDwEVXVceX/O4CqDhMMJ6SzNI9sX7m8OOx8eP20C5SU1Or+JM4+h3Z45tA2/NbBN7I8rekY25qYOmsxCDz0SYDmIt5IeaxM8Rc8vG+zY+f2r20Q6oisHZ18Q4281ESmkfDZyuYslhVkOUayG74o0T0MJS61Nlw7J0xlP3tKm2U9/uRqY9X0lSk0rZLQrNlpBkow+c8aBbVdxDltmZZFkfZDaU6XOs9gSmSi1Mw6C/cbDTRQlex4nXyNsxHa8/AxqQ/C+IkZriS1A== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB9412.eurprd01.prod.exchangelabs.com (2603:10a6:102:2c3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Thu, 23 Jun 2022 17:07:05 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 17:07:05 +0000 Message-ID: Date: Thu, 23 Jun 2022 19:07:02 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220623122636.24732-1-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220623122636.24732-1-anton@khirnov.net> X-TMN: [z1VjOvWAOWIRqDEafvVIZ/XS6re72+5k] X-ClientProxiedBy: ZR0P278CA0070.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <75899455-7ecf-8e22-35f3-0efb92d5cdd8@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 760c8d32-b734-4d67-99ed-08da553acbda X-MS-TrafficTypeDiagnostic: PAXPR01MB9412:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m45RWf4wUP1bZdhmAsUeH6yFtA2OBH2sM5dAmDQu2sBhWPg8ktHZ14ds8rudh5l/bwBE/nruExFybSPuZ9aVynEhZ26KNajxNN8L3hhcef7z0GVcMF0zEGd6kqkTsCQkRpeOTrPF2FYMqYYnTJa9qJSexafcGxZfZR0YLNnQassIHvVinsSRd4eS7eGn078u+sshGpjIZbwfAlJDS6UuExiopatzsveiRrlLtOXJGtIeg6w7YHDIgthgSkbAu/QUYHS17d7XceRQYfDgCn6JNDROajv1YkxIfGt8z7fgG8IZHf02laQSHnIikCgMRhaKCIzJf9l55FcOtMrqkR81z8DNFMibCoX1bYPDSbf6EhxqVNuJj/RPAPYzFyntvYx5/CwU2jHw7aPPpyU+mdC8Gv/2NfRy42qWCjUnSCunzWE3I7up/MrMpxM+EjkmcRZXcZrNqMwtvoIK7mNQ+6m14KD9hGVGa7YvGFyL0m61IMH8/j9QTfMDYMn3YOvtvsx+ZNpCZVmkZA4UewgGclkWYIMSxBrPQ8RndObKdsYeEG6tJFgFe3N9Ys+ugscJWHiy9B3Igmz1LOKBHWjKGXlbgTKGAZN/rUPTapuf8SmHUj9QQSX4oEgonyvdTtZ5uUHd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y1lLMXJ1ZHozNXJHaTlEUkkwa3RvZDdTYlo4WERYc0FreEM5NGJNU1JrUFU4?= =?utf-8?B?cTUrU20rZkUzdGN1ZUNvSHF4bUExeWcyY3ZvMS9RVS93QkxmblFWM1NUSEdL?= =?utf-8?B?UjFjT0k3amJoemplcEt4b1NwSkNRYjhTSlNrK2NkZCtSVWxoaUM4cjRFZi9B?= =?utf-8?B?OUlBQ1VFYXZCMDhaN2NaV0lKM3RRNzdFM2tVUGQ0WE1JUGYzay8vVGVCQ1Bh?= =?utf-8?B?TFArbVBKTVRMVmVNSUpWbSsvcUNjUzN6dTJBWlhBREVPbmsvNWI4Wmx6UGYv?= =?utf-8?B?VEE3OWpHbTFlNkYzak9MVWJOU1lFb3lzUk5nQ0JrRHdlQSt2alRpWERSYXBC?= =?utf-8?B?VkxQcGVsMUxWOG1Hek1tbXpCMGViUW4yU0FQYjhUQS9tbjRpWHJXcklmMnpv?= =?utf-8?B?aWh1MDZMd0QyK1p4cVhPb1hsSWY3am5vVXlPdDMvbEc2anZVU3AwdWxQbVVL?= =?utf-8?B?L0RNd21MT3NyRmxwcTU2MFVhQnZZT24wbFpwNVg5QzJwa2YxR1UraERvUkxR?= =?utf-8?B?dklhdFNteHJvZGd1NTdJYXJrTmgwMTNLWno4RjF6YUxkQzRVQ0FyTHdwMnZC?= =?utf-8?B?Q2lTR0ljT3ZBYlNvUWUzQThIdW5qZWpoQzRXVjA4eE5RZXdMaGdGaldDWG00?= =?utf-8?B?SHlRTHNPS3UzWGo4WHpUTkVwL0ZyVFdPWjZncnVOM3VoUkgzcDYvTnBPZVNq?= =?utf-8?B?RFVOQ0JtVnVlQ2ZtVmovU0ZPbm5jWXE2bXlFS01SYzRQWlQ2dGc0Rjg5bXl6?= =?utf-8?B?ZlR3STFEbzFFS203dGtHK2hQVzAzN2toUENtK01PMCtHdVpDeTh1MEFEWFk5?= =?utf-8?B?WGVPMlRjWlkvYmwzczZmTXlKMm5LSFlUQTMwWFJXTGZYL2pISzNWZjJIRmZN?= =?utf-8?B?T3NXcXFlOC9UZzI0cjVqSUtKYmlGVFRPeHZyUXBPU1craUthS2FQUlg5d2JH?= =?utf-8?B?bG1zeCtIU2RkUnVmS0V6eEhlSk1iOWg4REZzaE1ta2p5c1l5VlA4YWpYYzRK?= =?utf-8?B?cGFpSk11dSs0L3lNa1d6c0tZa1R1cHF2MW1JQlg5STNjSHV1dlZJUHB3YUpC?= =?utf-8?B?cUdzTTl4K2xNWS92OWpNTTlJVWtGcER3cVBNU1orWktoTXJBN1VHWHo5S1FY?= =?utf-8?B?SERRRnFySDNrTTEzWXlSYWJrQWhYZDhQN0FhTG1ESUlaSUU3UjNCTjN4U2Fw?= =?utf-8?B?a29xNjhheHRZS1k1c2k0aXgwazRrV3Rhby9QdmdVSEZZMnhldVRDSENOSkcw?= =?utf-8?B?dExmU0tKaUh1RVY4SHVVSFFoYkZXSzNvMVRNaVI4MXpHT25vampWdXcxR3I3?= =?utf-8?B?NHVqZkhpcXkzVDFKbnNjN2EzQVR0RDV1ckdFdHVmT2duV1Z6ODFiNzY0dk1S?= =?utf-8?B?VUFvOS9hSnRTdXpxMjUybWRiYzhNU1VvdllvN3RGRWU3Ry9jdnBCeStJMkRx?= =?utf-8?B?OTFGOWtFbUlMMTRZbmRIYjBCN21CaWl1ek1EcDNURitPa05XcElIKzFBVzNE?= =?utf-8?B?NTZoQWxwUExuY09wWElVZ2dPRGE2U1BWMm1FRVlzdUIwQ2w0bS93MVNoUTE5?= =?utf-8?B?cGhUN0g4SmNzSENaYTcydGNyekcrd0szZ3pQOVlZTFgzRGFXV1NPNzhwK1Fv?= =?utf-8?B?cFBZc3NjdytUWjF3dG8xV2M0Nzg0WktCaVBRd2I0MjRuck5MUDBtUzI5WDIx?= =?utf-8?B?b0o2MUFxNnRKN0JyZkF5bHlBSjR6TVFua0pFRi9UUHNxclIzZnBJSWxnSGFa?= =?utf-8?B?aGxYcys4SC84Y0RGMzFrQjBNZWZyQWZ4bUlPVG5rQlVCMDJnN0RZbmtsbVJS?= =?utf-8?B?MHdiRE9KczVXaWQ1YmVuUnRJSE04NUs1d3JTbEZaTWdxKzE1VHg0a3hhdkhK?= =?utf-8?B?eHJWbkVxNFJSMEtkb1Y0STRDN3JvajJMak1jRmxEWS9QV1hUK0pmQXB4a001?= =?utf-8?B?eTF1L3FaNEpyUFdHbWZaT3l1SWgyYkVjbjBzUkNqVjVhNVlaU0xhUjZuWEFv?= =?utf-8?B?L0RsN2QvKy9nPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 760c8d32-b734-4d67-99ed-08da553acbda X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 17:07:04.8223 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR01MB9412 Subject: Re: [FFmpeg-devel] [PATCH 1/4] get_bits: move check_marker() to mpegvideodec.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Anton Khirnov: > It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263, > ituh263, mpeg4video. > --- > Resending the set rebased against current master (there conflicts with > 2d764069be3b4092dc986467660607d922023332) and with patch 04 skipped, as > Andreas pointed out issues with it. It is not needed by the other > patches, so can be left out for now. > > Apparently Paul has withrawn his objections and Lynne approved the > previous iteration on IRC, so will push this in a few days if nobody > objects. > --- > libavcodec/get_bits.h | 10 ---------- > libavcodec/intelh263dec.c | 1 + > libavcodec/ituh263dec.c | 1 + > libavcodec/mpegvideodec.h | 10 ++++++++++ > 4 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h > index 16f8af5107..9f2b1784d5 100644 > --- a/libavcodec/get_bits.h > +++ b/libavcodec/get_bits.h > @@ -610,16 +610,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n) > } > } > > -static inline int check_marker(void *logctx, GetBitContext *s, const char *msg) > -{ > - int bit = get_bits1(s); > - if (!bit) > - av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", > - get_bits_count(s) - 1, s->size_in_bits, msg); > - > - return bit; > -} > - > static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer, > int bit_size, int is_le) > { > diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c > index e7e821d3b3..ded0a7f618 100644 > --- a/libavcodec/intelh263dec.c > +++ b/libavcodec/intelh263dec.c > @@ -21,6 +21,7 @@ > #include "codec_internal.h" > #include "mpegutils.h" > #include "mpegvideo.h" > +#include "mpegvideodec.h" > #include "h263data.h" > #include "h263dec.h" > #include "mpegvideodata.h" > diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c > index f01c942f04..af054360d8 100644 > --- a/libavcodec/ituh263dec.c > +++ b/libavcodec/ituh263dec.c > @@ -48,6 +48,7 @@ > #include "rv10dec.h" > #include "mpeg4video.h" > #include "mpegvideodata.h" > +#include "mpegvideodec.h" > #include "mpeg4videodec.h" > > // The defines below define the number of bits that are read at once for > diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h > index 1af8ebac36..10394a616c 100644 > --- a/libavcodec/mpegvideodec.h > +++ b/libavcodec/mpegvideodec.h > @@ -67,4 +67,14 @@ static inline int mpeg_get_qscale(MpegEncContext *s) > return qscale << 1; > } > > +static inline int check_marker(void *logctx, GetBitContext *s, const char *msg) > +{ > + int bit = get_bits1(s); > + if (!bit) > + av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", > + get_bits_count(s) - 1, s->size_in_bits, msg); > + > + return bit; > +} > + > #endif /* AVCODEC_MPEGVIDEODEC_H */ LGTM. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".