From patchwork Sun Jul 28 07:34:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 50778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp536598vqi; Sun, 28 Jul 2024 00:36:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBheGj9mcydXifO7SkJvn7Qc0+Rgle42EXLvcIfKRsHXAorvdSVVi3ajyzpQmmFqBnRtxc4K2fuxGCb1v2JzjdU6eCVPWecSrk0w== X-Google-Smtp-Source: AGHT+IFdNHSjPv+SvNInknpJYt+nFyxNl9FB6D7XamrSNsD4q45wZ4SuS0LJ+A2rqGp5/TEsZIbP X-Received: by 2002:a05:6402:268f:b0:5a2:b867:3bcc with SMTP id 4fb4d7f45d1cf-5b0224cf580mr2581270a12.38.1722152173935; Sun, 28 Jul 2024 00:36:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722152173; cv=none; d=google.com; s=arc-20160816; b=JwUVn/+lsv9giAL9+qwrm2MQoHTF0TbuGdWF+f/tVwdudFzg2cWuVf/I9NIC7VuwwI F2n67YeiobhT3cveyoFT8g6dEK2aDuqpIJkmUzyBWu6UhsCA3z3USOCx+2S8DqKSvTCy /K9BfTvRGUS2JkzYAmw+eaK0HSsIJijC9wI7uHKSAqA+w0vd3MQgw5hkCJ9XdAY5xLtM SRRlDcbyNcJf4VUAPDiwEDP/uceRH2ms2aOdtGAyYi7t5R/4/ONIj4rEn4sSpvBrwssu zu90sL3cXt94G8BvrtZbHSE+CaykdyWmDf8wufxKan0VCTjo+Xt74n+NrLcACuj2gmpL 206w== 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:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ZytdxogZHZyinHVcuIBKEzERz9A315WMj7Z0fYaeznU=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=rtjayCzo1ZLBXhTACZ4yafYM8z772RjP95K2R0m//+6EEpJutUOow3j4/UtBy/X6Pp 44JLUCReG/egG8fkh7Vkz2ywyzuFuvjRc9WNox+sbbLJKRDNg0aD+UzyZx1oZ6t1PVhk iZSi0Hju08fLpGuKu2vZPHq3gngtCrjjRGvUba9T7RSlQZocpTpivkkkgDPZVj7z5fWk 01l3WAuETZ+iuEZgG+fGnMqYyiSc/A9hDbCFIQFafQ4FfCG+1aS/pcn2ZcXQQK/AfRdp ni7bAdPeSFvcHampY7DuidFhbjhMKIIhz6PTncG/rHOX5DknjP7NYQJmfcrtCj9j/iJs yfzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=Er0KNXiK; 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; dara=fail header.i=@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 4fb4d7f45d1cf-5ac6632fddesi4594039a12.655.2024.07.28.00.36.13; Sun, 28 Jul 2024 00:36:13 -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=@proxyid.net header.s=google header.b=Er0KNXiK; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20AB968D8DD; Sun, 28 Jul 2024 10:35:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f225.google.com (mail-yw1-f225.google.com [209.85.128.225]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0393868D81A for ; Sun, 28 Jul 2024 10:35:10 +0300 (EEST) Received: by mail-yw1-f225.google.com with SMTP id 00721157ae682-66493332ebfso10038697b3.3 for ; Sun, 28 Jul 2024 00:35:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1722152108; x=1722756908; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zjJQMuocayCO6+sxCbJ3jypnO8vU2IOJ3maqwbNqSj4=; b=Er0KNXiKPzDJYKaNYXF/hS/uF6O4bdyF+/7gu9xv9GiFO0yxdDYMLDnPjusX5mLe/g Gfc+V0te6KKF5dN6OkN2eWHYaNPDof07hXDJ06yA6ut8r9Rqb5mfyu/h/s70antPr1sp Nr+nFn7F4qdNPYNaLIP9o5/8q0g+U+2TS4/UtAxa2jaJt7aGmbosRqtMCkr0Wbp9bCRh Zbvq649R+7+GooiaJRxRVVP5HU9jcdxBBbsa2Sre/zgX4H7cgvnJfKMEs8B7cidHfgJs ZiNbZkkkXthk4DF5JeDu2cJjLamk+54ofBB1SG8+Fry41zHjbQmYjs0pGitNRKuw8xVo VDpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722152108; x=1722756908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zjJQMuocayCO6+sxCbJ3jypnO8vU2IOJ3maqwbNqSj4=; b=XnVSbXlkCjg2QAeos9y9IBBzbxxOoWiYSDa8nOXv6F7PxOEYdGUb/eO2Kr4zfzpzk3 q+vA4ooNgN59lqE3tlvUKUtUVTiHxircj7AIGPbxl+YbvMqjV06RcAFTYTNhjGp+tiWi 6rOPYRh9zu+f4XE/57qa8wy22YvZFxeNiPJA12B+LXdIAJLRuu6pefZO2kPZJSvxsafU XRUq8xJeUbbZaIUB6InPwPTdrvNHeeS20t+QQm2lY1erw2eiqbBU5pSBFXIA9rSgeHI0 VEHmw3h7/y+i5sY1H8Qw3xm9BIsLXPOUHvEGHzRynKXG4VQ/SmRuX+cL4MEFML3YcK2t IPUA== X-Gm-Message-State: AOJu0Yxo/X/kDt0Fv1X38/HX2xKaeU8Zd07NXydMpzhWb8Io2kkaC3lZ Qyttd0HqfeFY1J6QVUQ6cRiHPwREWGG4bIrCQAK+QZL6OV4IIz21Qn+L6S6rTSuqACFCARC580x RDa1avwq4xw+WBxeAW7QvjmDBygYlGT3ycn3H4NUx X-Received: by 2002:a0d:e387:0:b0:66a:b6d2:c184 with SMTP id 00721157ae682-67b7bf994e9mr46083247b3.16.1722152108640; Sun, 28 Jul 2024 00:35:08 -0700 (PDT) Received: from wsx-cc1-001.. (c-76-136-218-80.hsd1.il.comcast.net. [76.136.218.80]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-6756ad425desm5735937b3.61.2024.07.28.00.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 00:35:08 -0700 (PDT) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 02:34:44 -0500 Message-Id: <20240728073445.725161-7-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240728073445.725161-1-marth64@proxyid.net> References: <20240728073445.725161-1-marth64@proxyid.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] avformat/dvdvideodec: Simplify/clarify logs, comments, and class name 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8Id5AAztDCWp Signed-off-by: Marth64 --- libavformat/dvdvideodec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index afc7836038..04c5cbea8e 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -21,7 +21,7 @@ /* * See doc/demuxers.texi for a high-level overview. * - * The tactical approach is as follows: + * The tactical approach for title playback is as follows: * 1) Open the volume with dvdread * 2) Analyze the user-requested title and PGC coordinates in the IFO structures * 3) Request playback at the coordinates and chosen angle with dvdnav @@ -565,8 +565,8 @@ static int dvdvideo_play_open(AVFormatContext *s, DVDVideoPlaybackState *state) } if (c->opt_trim && !dvdvideo_is_pgc_promising(s, pgc)) { - av_log(s, AV_LOG_ERROR, "Title %d, PGC %d looks empty (may consist of padding cells), " - "if you want to try anyway, disable the -trim option\n", + av_log(s, AV_LOG_ERROR, "Title %d, PGC %d looks empty (may consist of padding cells); " + "if you want to try anyway, disable the trim option\n", c->opt_title, state->pgcn); return AVERROR_INVALIDDATA; @@ -757,7 +757,7 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState if (!state->in_ps) { if (c->opt_trim && !dvdvideo_is_cell_promising(s, state->pgc, state->celln)) { - av_log(s, AV_LOG_INFO, "Skipping padding cell #%d\n", state->celln); + av_log(s, AV_LOG_INFO, "Trimming padding cell #%d\n", state->celln); i = 0; continue; @@ -1175,8 +1175,7 @@ static int dvdvideo_audio_stream_analyze(AVFormatContext *s, audio_attr_t audio_ if (audio_attr.application_mode == 1) { entry->disposition |= AV_DISPOSITION_KARAOKE; - av_log(s, AV_LOG_WARNING, "Extended karaoke metadata is not supported at this time " - "(stream id=%d)\n", startcode); + av_log(s, AV_LOG_WARNING, "Karaoke extensions not supported (stream id=%d)\n", startcode); } if (audio_attr.code_extension == 2) @@ -1770,7 +1769,7 @@ static const AVOption dvdvideo_options[] = { }; static const AVClass dvdvideo_class = { - .class_name = "DVD-Video demuxer", + .class_name = "dvdvideo", .item_name = av_default_item_name, .option = dvdvideo_options, .version = LIBAVUTIL_VERSION_INT