From patchwork Fri Dec 3 14:24:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp739154iog; Fri, 3 Dec 2021 06:24:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJw6dKL76iycQE4arnYEBqYc2KsQzYLhoa8M7weX9Ze4blxaVdDDO9qYK52+hB8pbTNMvgCh X-Received: by 2002:a05:6402:5244:: with SMTP id t4mr26863080edd.27.1638541469807; Fri, 03 Dec 2021 06:24:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c11si5432982edx.449.2021.12.03.06.24.29; Fri, 03 Dec 2021 06:24:29 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=SJukNhkg; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D143680529; Fri, 3 Dec 2021 16:24:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2065.outbound.protection.outlook.com [40.92.21.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B348680529 for ; Fri, 3 Dec 2021 16:24:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k/+c8FwOjuuo5/OiijSQSsltAyEbx39MtFsv3s6/ujePraDAonVtNObqasDvv7S85x5WVpkxqEGEX1ExLd850xPu3HZFl2AEzop8LatBEAoHck8gSP7SRGGtOk2X+NmhauVwfOEerD5T/PJMHzvYho1yqzArfJF7Fo4PXDVLmShSwcEqRM1dPcvrVRS5w4MwFcpnEuxPs0yv6j+sgWT0G821wxu+7+9TpAvEsZcJjN3R5IO3dwTlO3tlegJPFxe4GsTS4TCziJGz3Zft9l6C2vjMe5y9KXaJ98iyeLEwTLC/C8mRp/YoRXyHQOhRtL/52Q/EznR8VR4HSoCOo5i1rw== 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=hvW2wet5kaixt1wGh3Wf33V0xL8AQt320T/GzrBJfXw=; b=KiFKvWM1bp9IRUk8pK+9xv+DJlPvuupjzDU6fZV+AU9155ByWGN/EHMtYmoXempNmeORp8/rVN+a8Oim7vwtbupDf4YPmeD4gMx9IRyA2pjb3ZNGbr/+y5b9CZBn0yP2v47eHun/WKZSpFOtovTWLxW8rvtSjxPZFqP48CMiZob4IBQ8aU73LkpLYMAnkSSKkJoQcWVziE2orsZyLL5eINiscWUDsYHss4bz8COsKl6E4AKJlSX9p/nXDSOL4b7uhu3O3ajP+c3QO5lnBk85MgV+S2t2nTabm3B0Zzj7MbqzHpE9GXkYiNn2qQ0axUCAlLO80Bzimq1ElG8WPajQ0A== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hvW2wet5kaixt1wGh3Wf33V0xL8AQt320T/GzrBJfXw=; b=SJukNhkgSNKW7Z4teRtbb7u1XBEy5eIk+bfczzFqcP31qwBTFVdWS+4aj1hf7YESrLPx7tj0IIULTjjY5W3Nf/8/pwJvek0mv8A88DLu4MxnWQcBAZBbxGOh6rDKxsqszybyqnOc0M5zy1iLzNXAh2rToalO13R6Q6L5ToK9h+AEN22Ue2aPUJhOOWR5k/+fhRzRCbAYaS9qI8nnvrxMwIGVnqyZn+/XGaoFaoYKY6NPjg+GjEPv5cOHDS2sgELl+rXLvLisjAS2PCpr95gursykWuiBYoilFyJAGopvSWXf5XQ0Rrze58D+mAwCXJSrykeGM4ng7r6GDfLOcysbig== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0079.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.15; Fri, 3 Dec 2021 14:24:16 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%8]) with mapi id 15.20.4755.016; Fri, 3 Dec 2021 14:24:16 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avcodec/dvbsubdec: Fix conditions for fallback to default resolution Thread-Index: AdfoUW0yTa1ur10BTR+QBum/xH0Rew== Date: Fri, 3 Dec 2021 14:24:16 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [dbz5MMBVN8O7Or5EvxrbAxEwgD7MBAYW] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a1420155-2ae7-4be4-df17-08d9b668966a x-ms-traffictypediagnostic: DM8P223MB0079: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PIBfnkUeHRAVx2Fe9ce98rzgU3kVhkXrgNeQRdS3q3QOaTDYySb+NzCRE4jLs16sLgal42fYjTDZTzm3/oHMVVhxKmiD0uHwrqB2dEMXgIjudTRKsFN2zhm+VY0fWmrmMsVY8bp/Z66iykWE9JxJpV/PfScJ57T6vVS/L8DnjPsBJBwscVMuEmR8J7n9rpHNLasxKizHO8L3OEyB6k0bQSAMGVCnArYHRpEoyG3MLPlH/ynWk5W7TuSguPAOOt11Du8YXrshmG3ain93bcaZc/s9IZUJPT9E5Uoe5vLbT4y56l8K814SSThmE7lnSJ0VNTWkDZZBHIs6r8ozgHTYcHQoe9K3QqsuoPB68Lf3cEBr8UMakjoWi5Sim6KgfwjkcBgR3u2YVEqaspmF7MPb4Cxqf1uY9Gq/4ecWLX5VomiKbAqwOEYoOQfQ/l+7ahB8q4sk+EJ/fzBdLjmqNCBXBaLArf1MHw7ua3rS/slDCa3lBIrur52rVTTg4t7L17mjYRL+B2paWlKqChPfX4ywitk+GKuHDmUQK+uy1okSLmpKdEjWGqnrsiHhFE/sgSAn4qa9jqo9SXPpLRX8X3RZDTE551kVac1qqdTZJiMBHN/k7nwoDy80NdIbAantSD1d x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?N2TLU5r4j2+P/+6R2aPHFqZb0cIG?= =?utf-8?q?HlIYJN+WzzuAWO5n1O1JJeyGW1Q+zrKVn4IlLtn2IRvwo33wKpF8cUvoWabQA9qRZ?= =?utf-8?q?iGKSkpJqw8Lbg9c7651wYusUqyc5VCAhPq8QhT9Hw8uKWShLQbROMDYeb47czhMdS?= =?utf-8?q?3rg9UOrNbxdWNhH84iRYb+VOzItf5+cxO7kycox6rBpZop1HSjSn2LJVlPKKtrtBj?= =?utf-8?q?O+SH4Ht5AoXlqV7ZlxKiBXXRGPx8AAGPv4tsS4/RPeKfgPMHaevYlrNpJiH6hnRiB?= =?utf-8?q?Df2un9CFi9MXE/lW8evkxkP+e+ugWF8opmffJouKBVQ4+Lz3qCuhlX2HEV8XUIf4o?= =?utf-8?q?lBa/xUrLqZlvLt077Lhc91Qa8SRs1lXJtymdSCQzW1XwoC5bh89L+QhfaCNnp9WMP?= =?utf-8?q?9rNe5Cvc9FHJWOEMj3ydFQ50a2l/ZyFismiPsllrK/iwXNrxdmE8Ks0Vve8WrOeWc?= =?utf-8?q?xedVjDpVU/UPG7JO2mV1LsdjFcXgOV49MtNtqy7hNiqHTPXD5SkQQIkbVpdIQDNdA?= =?utf-8?q?94mRq0ZUrnbV1K0PH/8vHSPI1z5oHMhd61S2uE84H+2nuoYIkUwV3yrC1sJhzi9x6?= =?utf-8?q?lpwHeZBtv7gQKvxUv41NRAvTgWTq94sJEPdzCAQNzCKL0GUl8oj54dpASx+YHpSuG?= =?utf-8?q?KokLQvn+23aexj5UxfFaG5Of9BdUSnt7DIJujUlx92P9BLcOZRXiUS8c51LE+I9If?= =?utf-8?q?gkrBy11MGVAR78uTlwpTk56SndI9NP3os4D0KAysB2QB6qGwuLOPEQ3f1Yvzl7FMr?= =?utf-8?q?KeIU86A7NkG/+zifDLsLWRKWsD5FYyZ5FtKP6kFka/0n5HYEnE31Fyjys7z8rfrIA?= =?utf-8?q?QDvVXeUbh0jgj9pFNpOUgP/sMXj9bKr6ElXpSlcsh8dWMhwmJKkoHDg9tI/+g7yrf?= =?utf-8?q?DWx5blfkyI8fwjpZ9wZfB4cdmFwds2RjswgGZPSxUjmw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: a1420155-2ae7-4be4-df17-08d9b668966a X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2021 14:24:16.4821 (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: DM8P223MB0079 Subject: [FFmpeg-devel] [PATCH] avcodec/dvbsubdec: Fix conditions for fallback to default resolution 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fpcoHgzZifpZ The previous code expected a segment of type CLUT definition to exist in order to accept a set of segments to be complete. This was an incorrect assumption as the presence of a CLUT segment is not mandatory. (version 1.6.1 of the spec is probably a bit more clear about this than earlier versions: https://www.etsi.org/deliver/etsi_en/300700_300799/300743/01.06.01_20/en_300743v010601a.pdf) The flawed condition prevented proper fallback to using the default resolution for the decoding context. Signed-off-by: softworkz --- libavcodec/dvbsubdec.c | 51 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index d192f3251d..a5951a4372 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -33,7 +33,7 @@ #define DVBSUB_CLUT_SEGMENT 0x12 #define DVBSUB_OBJECT_SEGMENT 0x13 #define DVBSUB_DISPLAYDEFINITION_SEGMENT 0x14 -#define DVBSUB_DISPLAY_SEGMENT 0x80 +#define DVBSUB_END_DISPLAY_SEGMENT 0x80 #define cm (ff_crop_tab + MAX_NEG_CROP) @@ -1624,8 +1624,12 @@ static int dvbsub_decode(AVCodecContext *avctx, int segment_length; int i; int ret = 0; - int got_segment = 0; - int got_dds = 0; + //int got_segment = 0; + int got_page = 0; + int got_region = 0; + int got_object = 0; + int got_end_display = 0; + int got_displaydef = 0; ff_dlog(avctx, "DVB sub packet:\n"); @@ -1670,34 +1674,28 @@ static int dvbsub_decode(AVCodecContext *avctx, switch (segment_type) { case DVBSUB_PAGE_SEGMENT: ret = dvbsub_parse_page_segment(avctx, p, segment_length, sub, got_sub_ptr); - got_segment |= 1; + got_page = 1; break; case DVBSUB_REGION_SEGMENT: ret = dvbsub_parse_region_segment(avctx, p, segment_length); - got_segment |= 2; + got_region = 1; break; case DVBSUB_CLUT_SEGMENT: ret = dvbsub_parse_clut_segment(avctx, p, segment_length); if (ret < 0) goto end; - got_segment |= 4; break; case DVBSUB_OBJECT_SEGMENT: ret = dvbsub_parse_object_segment(avctx, p, segment_length); - got_segment |= 8; + got_object = 1; break; case DVBSUB_DISPLAYDEFINITION_SEGMENT: ret = dvbsub_parse_display_definition_segment(avctx, p, segment_length); - got_dds = 1; + got_displaydef = 1; break; - case DVBSUB_DISPLAY_SEGMENT: + case DVBSUB_END_DISPLAY_SEGMENT: ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, got_sub_ptr); - if (got_segment == 15 && !got_dds && !avctx->width && !avctx->height) { - // Default from ETSI EN 300 743 V1.3.1 (7.2.1) - avctx->width = 720; - avctx->height = 576; - } - got_segment |= 16; + got_end_display = 1; break; default: ff_dlog(avctx, "Subtitling segment type 0x%x, page id %d, length %d\n", @@ -1710,13 +1708,24 @@ static int dvbsub_decode(AVCodecContext *avctx, p += segment_length; } - // Some streams do not send a display segment but if we have all the other - // segments then we need no further data. - if (got_segment == 15) { - av_log(avctx, AV_LOG_DEBUG, "Missing display_end_segment, emulating\n"); - dvbsub_display_end_segment(avctx, p, 0, sub, got_sub_ptr); - } + // Even though not mandated by the spec, we're imposing a minimum requirement + // for a useful packet to have at least one page, region and object segment. + if (got_page && got_region && got_object && got_end_display) { + + if (!got_displaydef && !avctx->width && !avctx->height) { + // Default from ETSI EN 300 743 V1.3.1 (7.2.1) + avctx->width = 720; + avctx->height = 576; + } + + // Some streams do not send an end-of-display segment but if we have all the other + // segments then we need no further data. + if (!got_end_display) { + av_log(avctx, AV_LOG_DEBUG, "Missing display_end_segment, emulating\n"); + dvbsub_display_end_segment(avctx, p, 0, sub, got_sub_ptr); + } + } end: if (ret < 0) { *got_sub_ptr = 0;