From patchwork Mon Sep 13 13:46:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4015230iov; Mon, 13 Sep 2021 06:47:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxs7g/pPG1gV4BTemUZwoChYRxmmtJVtCwGv1MIp1F4F6Tla7otAYNgtXp925nUAfFh9Jwu X-Received: by 2002:a17:906:1806:: with SMTP id v6mr12999396eje.420.1631540824518; Mon, 13 Sep 2021 06:47:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g21si7362733edb.488.2021.09.13.06.47.03; Mon, 13 Sep 2021 06:47:04 -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=@outlook.com header.s=selector1 header.b=AHOMWGrA; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9DA868ADC6; Mon, 13 Sep 2021 16:46:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2053.outbound.protection.outlook.com [40.92.90.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0E0B68A64B for ; Mon, 13 Sep 2021 16:46:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ficKSl6kZwNOsg3Tnok76NLWsMnETxSqLlEE5DYjfZEQtASPfIjB1KwzjpR3UrAcnLuaOOpwA/EdBYeErLYRcSkfOI3DtByT4M5oMYs/RwS/kyNpYF9kauSN6HwpFnhQMqSQwVKII2YMUJi8j8Le3aBgl4/MK04jTB/RjqOLFr7frDcUlXrLy96JR1mUSwIf4TPcavMKAZmi2xAopOZOzwP6PAnc6PEY/pEjp1a0Z5oI/lp6cdZQU+1bDvuR3OGLsnintK8WVseNHjA7ICVdfaPYKgl6KfLgzWnwejvGkBMZ5OyS/5aS9/08VUFUK8KorQj5oeXqti8ZBAxcRAkCsA== 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; bh=vmmlr2WfGWmeIYd4kUCYFMO/f360HdHFnWjTAAyvLn0=; b=YEHweEyDqb36gRUhvK/yYqviToj7WApKRCaa72I/L+K2qLyQXJOVugz19FaW075AgSnxzCF+TLUXKtwD/P1SNe/gwGScBSzQ3V9Mg4g1npT/gB+Dd+DGCxrsM74FRWvk4EqhC1YyF5EOfEYfA3okIZw4v6tvHJcfeW5HqlqAWW4baQUKnGXmvB3D+Fb3TGDFi10bispSpgZUG0s8IuXOJlGOrMueEtaBC0dx+khGM2nZWpIvwZO0rR7U6wH7hvF42BJL03y2xBSzzeePPK8/UcvpsYYmDB1jFX1YGQhybHII9CT7eVqIH/OBj+BY5mOCohSkHko2zwHY1OuNPgqaxA== 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=vmmlr2WfGWmeIYd4kUCYFMO/f360HdHFnWjTAAyvLn0=; b=AHOMWGrANZ9rtmSechkcdkZM0DNfDxTv0kY1YoYZyJRyNjwhyDCq/wSti8s47XtHXaprv9fumFh60SHKZl9hCBA3deGuAua3MTBFQbi+7cHN6kWm5Cum7c5wV+oyQ1Y0/P7lU/pDrYryihPAD3PSXBNtSY5J1gCwcVuJpJ9JQPHkAzeopTC3i1EUEMl6dV4Bg3Jka0VdrdhSRbe4TYmQMfFgT/L8fgDrYXMML1w/lQT2gY/pwXqTmYpTctQ1uUesaap/B1StXBhclkHNUdpGhuvRoHkQzpFQXKhyMxBegIAwYhM1myjqpFJefRYrnOM8dxMw6i4uYkJWYtDE15+uyA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3832.eurprd03.prod.outlook.com (2603:10a6:20b:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Mon, 13 Sep 2021 13:46:52 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Mon, 13 Sep 2021 13:46:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Sep 2021 15:46:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [YCVju7lRRMm1qDOqXuoQ0f1smfnWjBSX] X-ClientProxiedBy: PR3P193CA0039.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913134642.2727609-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0039.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 13:46:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f3638bd7-d96c-43ed-d871-08d976bcf0b3 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3V/TtV3mrfogcNkFyC66tVZ1qb/dvYHp+w7MC1g4RFWtTpKHcWb4YtFKEAnxoLJeWNjyUk5KOgDi5OZ4v7QEIRpgX9hJhszdBqyo10gL+o4OH/phnzOk6Z8RRd8NnmOWwXzna3xX+57BA1lBACpBIu9FBGO5aeJJFWyzMs5ZxZlWspFAM6sbtiBp6Ppxk0//EGCAmRpKtkuwqLlUa3FaCGLCU5dEcV0O3Bh8IhQ5kWo7pMUiLEiq7nYVRmzWaFDjroIhb/SpP4qWL9egVuHtgWLTugLlNMXo0ro0gs33i2SreyaZOtjvB4naGqxzr+iQVkXwmS+v5pgFH6iipr9tgiTY9eNbk6/DF5NodmaELxqQ3coQYaOdCI0p6ImGYQne4yfobdQYIWchENMb6QKb7E7FDQ+686fcUZASF2bqQe3rjIkvYhj0VQG+KylzN5LghpJZJyJUhvaJ491ZvbTCNGNGyYhAWJRkP6NR45rGA160ZFnVl5agv1JmBkb0LusykEppUkWX1HzxDfunGmNT8ddiNC3Le78o1hRK8rHe76ykEsRUJ4qoQFctxR3MBMsdPGPH3rD2AaY1GHV7pVPOosLzWTVYqhYgHZ3egTQgUzSMgHg8oJsKRjHOaF5Y3A1BwzrdrZa9VJU8k/s3DTAlaX5DQHnzEhMSaiKkX6xWVWYBgES1kjxcAiWwt6FErM3DxNH4nDnhLrP4RVMBKdqaDlpeI4NxYo3jgc= X-MS-TrafficTypeDiagnostic: AM6PR03MB3832: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2aCz+BoTBq6lO8rizK9brlLb3yB5FLAaWPeJ2JVOi4iW5/8qzlAF6MCvq0AW2eoeaeHxouYmoKKQm8SX7qgAaoZlVg3YxiTaGxcim92OuZTdj3fB9cYjrZ/MeMvUYGAx0E/lYdriyHYFwk40l+QVcc2xkf5M04jCkNNjsG+21EnjJiyapqBuAXE/XVJo/pJ6fRs+UCLFwdPeKjD0ZEXeDmrOPS9fS2Jvh9tzCORq55+NaKi3Gx51OtRZZG1nhsGS/1VHl9H2Y8JP8eqFGnwL8BeC/UwyA9vIdVU0QlYemm10xdjuw0UHlKTtheMKqruK23g9HrOb55+5zKc/q444A2Gi4nrFyyGYD5shagSl7Z0rX2KuMsy4GYVD2uS0VysehTEEOyfi7o6kC5ASfF/ot2rdSYWx/mFCU7916Y8iMTB+h4TrzZp5siMAOO6/Ql0x X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: f/mqOj6ph8DR8ZZLweBZleatIHM9ciaswnmYxxfjZRtMcbnDqBUV1txtV6InkUlxKDFKuq1nx9FPA6Hr5KE2GTaRJMyvXqLKtnp05YRDLdmxi8oKyPobE3bizlJQSim+HoXLm5EWgBUwGD0eFQPqbg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3638bd7-d96c-43ed-d871-08d976bcf0b3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 13:46:52.0056 (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: AM6PR03MB3832 Subject: [FFmpeg-devel] [PATCH 01/10] avcodec/mpegvideo: Move startcodes to mpeg12.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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HeTU1xS/z/I2 And remove the MPEG-4-specific SLICE_START_CODE, which duplicates SLICE_STARTCODE. Signed-off-by: Andreas Rheinhardt --- I can add a commit giving these startcodes a proper MPEG12_ prefix later if desired. (Some of these startcodes are btw duplicated in lavf/mpegvideodec.c.) libavcodec/ituh263dec.c | 4 ++-- libavcodec/mpeg12.h | 10 ++++++++++ libavcodec/mpeg4videodec.c | 2 +- libavcodec/mpegvideo.h | 12 ------------ 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 565a6a1ac8..3f982f414f 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -217,11 +217,11 @@ int ff_h263_resync(MpegEncContext *s){ if(s->codec_id==AV_CODEC_ID_MPEG4 && s->studio_profile) { align_get_bits(&s->gb); - while (get_bits_left(&s->gb) >= 32 && show_bits_long(&s->gb, 32) != SLICE_START_CODE) { + while (get_bits_left(&s->gb) >= 32 && show_bits_long(&s->gb, 32) != SLICE_STARTCODE) { get_bits(&s->gb, 8); } - if (get_bits_left(&s->gb) >= 32 && show_bits_long(&s->gb, 32) == SLICE_START_CODE) + if (get_bits_left(&s->gb) >= 32 && show_bits_long(&s->gb, 32) == SLICE_STARTCODE) return get_bits_count(&s->gb); else return -1; diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 4cd48b5d20..a7b94c132a 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -25,6 +25,16 @@ #include "mpeg12vlc.h" #include "mpegvideo.h" +/* Start codes. */ +#define SEQ_END_CODE 0x000001b7 +#define SEQ_START_CODE 0x000001b3 +#define GOP_START_CODE 0x000001b8 +#define PICTURE_START_CODE 0x00000100 +#define SLICE_MIN_START_CODE 0x00000101 +#define SLICE_MAX_START_CODE 0x000001af +#define EXT_START_CODE 0x000001b5 +#define USER_START_CODE 0x000001b2 + void ff_mpeg12_common_init(MpegEncContext *s); #define INIT_2D_VLC_RL(rl, static_size, flags)\ diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index a6ed842ea2..fcab975a9c 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -550,7 +550,7 @@ int ff_mpeg4_decode_studio_slice_header(Mpeg4DecContext *ctx) unsigned vlc_len; uint16_t mb_num; - if (get_bits_left(gb) >= 32 && get_bits_long(gb, 32) == SLICE_START_CODE) { + if (get_bits_left(gb) >= 32 && get_bits_long(gb, 32) == SLICE_STARTCODE) { vlc_len = av_log2(s->mb_width * s->mb_height) + 1; mb_num = get_bits(gb, vlc_len); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 76b32ea547..9f8d80df3d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -63,18 +63,6 @@ #define MAX_B_FRAMES 16 -/* Start codes. */ -#define SEQ_END_CODE 0x000001b7 -#define SEQ_START_CODE 0x000001b3 -#define GOP_START_CODE 0x000001b8 -#define PICTURE_START_CODE 0x00000100 -#define SLICE_MIN_START_CODE 0x00000101 -#define SLICE_MAX_START_CODE 0x000001af -#define EXT_START_CODE 0x000001b5 -#define USER_START_CODE 0x000001b2 -#define SLICE_START_CODE 0x000001b7 - - /** * MpegEncContext. */