From patchwork Thu Jan 20 02:48:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5411450iog; Wed, 19 Jan 2022 18:53:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzsbFH5FQ7l5BzaS4Kku80U7PmVNUyJn2vd0xk0nQC4ic0zliuoKYQ7VM4Qe84cFw1bcNJ X-Received: by 2002:a05:6402:11c7:: with SMTP id j7mr34697539edw.315.1642647239765; Wed, 19 Jan 2022 18:53:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642647239; cv=none; d=google.com; s=arc-20160816; b=Cdd3jYFG+ibXLnpU/p+2c1QOeU/nY5Ff8D4x78bujdokglUa6pbW6wkrOOhPLb56tD 8MtDUGqcBFG6NmdnZRwail4iZoEEvo+H1rd6XmvE+OiCuNlvfnLuu577AuzlcwUF90fo JLnjUGXAe2c7FTt0QC1gBNmGzypc2EFmBC7q1JlDBuKWe8TPcWIFIuYbg9KLu9thpo8B D1+DnMQmruWMbBfC1FkmLNv45DeF10xUhrulcI8DBrEp1vMjZ7mlWkbvwNTjbZ4ufUs9 F1sOGmDyfarllGTYas1bkldyj7fVAG3MLh49jiat4FwSzU7m6BoCd1758SL6am4Fvonh oCNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:from:references :in-reply-to:message-id:dkim-signature:delivered-to; bh=TLxTlDyiyoKHVDXw8hos0tqxUd05RXDYZZ4nSSTcfqU=; b=pG6ByMlfGvUsrwoP5OwLNTn9WGI5brnvin+OzQVwgNlS/H5ZnLKhVkj72bl/mpkYs4 wMTCsTwqV9MlrBL5Gs0CjWZ5HevjroyJHG2rmjsVtIIBPjb6uU7CGGXoEcQNqZeAQN4k fa+gNB0wDU0wfJ6i0dM0Aok666YfzQndtDzTE9kpYe8zSbZJr8ecX4MHUO4Zy+3bFzkj cZOUdymegYkWIL31ztN5Hlwb+an06TTJ2IjwK6YI47ZbYlhfg6JqWKDveyEbsFHzDUJs Sxf1eKW7filuLUSKV8SlzLzXpP8IOinWXS2CB92qUZtDftdGuqTqkV2uN2jcsyFiZxCl MFwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=a32ax7Ga; 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 g15si1328931edb.63.2022.01.19.18.53.59; Wed, 19 Jan 2022 18:53:59 -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=@gmail.com header.s=20210112 header.b=a32ax7Ga; 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 F363A68B296; Thu, 20 Jan 2022 04:49:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7271668B25E for ; Thu, 20 Jan 2022 04:49:06 +0200 (EET) Received: by mail-pf1-f177.google.com with SMTP id x37so115194pfh.8 for ; Wed, 19 Jan 2022 18:49:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=DGjY2UfwVDogFgZo29av9KeU5AuKhN9QE8fHp3Wbnfk=; b=a32ax7GaizUPFcESzXSozwYQVFlFS/ojNH63r8bU/sGtS64TVAedeNR/5jBqOQF8Er FketM5d2VbFM5jqLY2K1B7cCiFMdcGh3Jmf/qYKByvje3+WUbcLohI6+dVpvJX9F8v/v 4Y/OVyytGTJkqfJ88FO9snvYXDbqsxa+xAh40zYBb5OvIoMmlDgDQxuSyWsdxnhoVOv5 tfuBGmhgwcK1Kn5c7sU7RaKJ6Fw+ZC4r69b6m48xekCoq9uXy6yEDCfEYokG1altmVuD oJdTeNJlf9f5bd42wA4tXdwURm/IW2rtIoL0FSeyi4DYQFq2zttcy8Dr05AsD9Uw5R6G WwFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=DGjY2UfwVDogFgZo29av9KeU5AuKhN9QE8fHp3Wbnfk=; b=IXncJOUJYNyae7NKabe4O5smbYMh6dCvG7elSYo5kkoFYdIorx/x8n3mi3slMwFEhg cj925pHvVG3s8AqsRfveIQORxx8qFEu1/WT7847nnC6wOjuaitefcHpDLmbk6YwTYQFs 6i+5JhN7iiuEy2NeZgomhVBqG5uQdlU1Dob7cKOay+wg6zhhRY3SFJO4t69VPIXIoZJu rpCvJ2tXgju0fWv4wuLdWznS5cd41vXCqvYTWTvtRuxmLIsmXEqbMzYqKLNcvnLXkekA ZU7LPO5cYPpSr9N9F6yq0wVEg6f3czjTocxLL2ZHLr71RaZYshP337LGukwXGdxQbHtf zEIg== X-Gm-Message-State: AOAM530DAgqYA+OQ+cC6MTnG0GZ38icRxDyklig1YAG/y+YwiQTHn/z3 3EMZvspnkBgxRL9B189NQY8pd5aOpk8= X-Received: by 2002:a63:6d0e:: with SMTP id i14mr22498171pgc.236.1642646944611; Wed, 19 Jan 2022 18:49:04 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id b14sm801407pgm.54.2022.01.19.18.49.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 18:49:04 -0800 (PST) Message-Id: <217d96c39dc64cf23ff7fa3022c3e5862ce79912.1642646916.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 02:48:36 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 26/26] 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 Cc: Michael Niedermayer , softworkz , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0wd3sZu9fNtM From: softworkz 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 0d64c6e71c..3a6259101c 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) @@ -1620,8 +1620,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"); @@ -1666,34 +1670,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", @@ -1706,13 +1704,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) { return ret;