From patchwork Sun Jul 28 07:34:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 50777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp536527vqi; Sun, 28 Jul 2024 00:35:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5vvMaUo1Ml2ZgrK8xDNkaUEfxSAWM2eIeEoyk9/vV+RPtkqOkzzmtTNw7TbwR79tsIBiTp++SjTNnZHCLRKvvnWR/dq6lQpqK2Q== X-Google-Smtp-Source: AGHT+IGJnCKS9/nPe/fm7YEtlqE0WVRuQTljBpufJB3sCheINRQB82BaDkrixCBXD4cQsfAYENOY X-Received: by 2002:a17:907:d17:b0:a7a:9f0f:ab26 with SMTP id a640c23a62f3a-a7d4006e3f4mr296067766b.23.1722152157169; Sun, 28 Jul 2024 00:35:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722152157; cv=none; d=google.com; s=arc-20160816; b=JgixKef+6X4lmkESF8vUsA1nZ1EZHO2e6rAMTXqSqstJwmp5y1hyLZBfFpVO9o3Y/r FmIASeYaZXFSzw1DYUQ+5ss//uSbAhU697zKSBffWVmG5mOu00rhOkB/IRleosV6QSp8 Icev+RsgLfeqkPyxIFDJn0SKW4BiDvohHNmWcEVE4yuQhZfH/P80QRpfJ4MB29saaeXh odMs0TOBSfhTzVlD5FhKwcA8g570mP6zLr221PclRex5JBBLQeFL6/NMzWQbt6/BEnrG h+XmXwquUNJSN2t86f5cevWwIsezV9pyjrjVpcGcUPqUGB2g3W9W8KmfZ3iZ6akgyQFx ej/Q== 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=MAT5yQaGQ4O5O2iDhMBQuKYQpfXj5fcAu/a4ktBXzpM=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=wehgW0f/SloUden6A33/unw25nqwAhFSLPD9SGODUhZw6Km9eC0XXUcC7hx2Wo8qA4 xytlOf2CBWEDE01o//m/GQxFhJGLuI5pgnxtMdasvKPWGPyQcBRHXAlmc/Xj31EhQ6OI LqB1wHhdAOQ0VPno5V5sTd25LLRGWClJh8NzYtXHsApwBd2O44Sscu7/dfUFnWmSb6JS TApqPzo4fLpE5dCx4E0cctnnbiHwb6PbQBskZsS09vKNJWoaV1lXTYMvHe77GU10Di6s P2mY5ka7Zrv/m9ZZURGc0Qut2r+FGLmhI9JYiAiCFL8DDUIcf57eK8Nq/Ru0LCYgLBII J1vA==; 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=RQSo1PWY; 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 a640c23a62f3a-a7acac8daebsi465793866b.720.2024.07.28.00.35.56; Sun, 28 Jul 2024 00:35:57 -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=RQSo1PWY; 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 39B7B68D8C3; Sun, 28 Jul 2024 10:35:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f227.google.com (mail-yw1-f227.google.com [209.85.128.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37F3868D744 for ; Sun, 28 Jul 2024 10:35:09 +0300 (EEST) Received: by mail-yw1-f227.google.com with SMTP id 00721157ae682-65f9708c50dso11414737b3.2 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=MDTiYgmwY7+XKTOSuCQS+EiQBorowoe+0JnySgRJjV4=; b=RQSo1PWYR45P9Pg+yA/CPKNZBmN6qKQdzfekcgwXKe5l0DiKbNt7VEbtbqdPRwhRPn 0dl1qWXhrjJd/11cg5CIuwVJk/2e3kkgVoIiTdYheVDbmu1Ss2y0PrN+LppcP+EBXIJr mH6gQdKc4sOIVsC+BIZXoS2O4kXOynjZZcsH0wnhodEYCru7R/AmrQPtZU2ACbdX+xu/ iQv9yGKWmT/9sPSC6/b4P3O5kEm//NWRW873S4ktPI8fhTNgV72r2sbgx+Miv6Hq1W0R hBp8wXiCQdE2ZaCmIJFIc2Pqh1wftxbwwUsWV+dJLhvcshuJaUrdhO3KHL1scCtZV66W 30Pg== 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=MDTiYgmwY7+XKTOSuCQS+EiQBorowoe+0JnySgRJjV4=; b=ByL5Sm7LFOlC3IF3RCYgjCWi7tnyunQIDFSjs/ztDXGMDyrYPeryOGtDewf7HB6JZU 7f/DJd1SHT7A/UUsbrNktEFjwrOq5qhyCm6AJniI880oHEIifYW5Mt6dH4PYGJdsLmx7 YKEt70kebl+pVmpyDB62BASTpdY1snXR23CQoOcjNeWR5/2iZObBKsR1UzT7RTim3/xT TwWmHikdLA64s7N0b/VT9xqbguIIAiaP/p8DBtoMeQxpzi4myyxUHMaWi3D2eOR6gtjO mgV/10fWSY2TqFXV5PKLjOFi0t+qadBQO1fyApbtHlJmfHe+qKt3RLBw5nzatrvIzRqh qJXQ== X-Gm-Message-State: AOJu0Yx4BzTC8fFBQPoHoZXlffozX+qqijnDDuLivocrUvegpZHpPtLw KF1KwVHNESCcppNwfSsJYMu2kiDInAANFQqodUAg4gO0TCG+3U0uH4Qp2ha5/3NGmFlhDKhDt4t Q4h+gbj+C8KQCC7qkthmSDGtS4CWM9/3EXldZatds X-Received: by 2002:a05:690c:6304:b0:665:a133:f294 with SMTP id 00721157ae682-67a0968dbfamr51865907b3.33.1722152107880; Sun, 28 Jul 2024 00:35:07 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 00:35:07 -0700 (PDT) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 02:34:42 -0500 Message-Id: <20240728073445.725161-5-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 4/7] avformat/dvdvideodec: Chapter markers and trimming for menus 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: z8YkyOAac4iG Menus can have chapter markers by way of cells, and empty menus can be detected with existing functionality. Menu selection also is in need of usability improvement. Implement chapter markers for menus, let the trim function detect empty menus, remove the unnecessary ceremony around the -pg option by simply defaulting it to 1, and finally default the menu_vts option to 1 since most DVD menus can be found there. Signed-off-by: Marth64 --- libavformat/dvdvideodec.c | 106 +++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index f6373d8ade..a908acfa7f 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -367,6 +367,14 @@ static int dvdvideo_menu_open(AVFormatContext *s, DVDVideoPlaybackState *state) if (c->opt_menu_vts > 0) state->in_vts = 1; + if (c->opt_trim && !dvdvideo_is_pgc_promising(s, state->pgc)) { + av_log(s, AV_LOG_ERROR, "Menu LU %d, VTS %d, PGC %d looks empty; " + "if you want to try anyway, disable the trim option\n", + c->opt_menu_lu, c->opt_menu_vts, c->opt_pgc); + + return AVERROR_INVALIDDATA; + } + if (!(state->vob_file = DVDOpenFile(c->dvdread, c->opt_menu_vts, DVD_READ_MENU_VOBS))) { av_log(s, AV_LOG_ERROR, !c->opt_menu_vts ? "Unable to open main menu VOB (VIDEO_TS.VOB)\n" : @@ -527,7 +535,7 @@ static int dvdvideo_play_open(AVFormatContext *s, DVDVideoPlaybackState *state) goto end_dvdnav_error; } - if (c->opt_pgc > 0 && c->opt_pg > 0) { + if (c->opt_pgc > 0) { if (dvdnav_program_play(state->dvdnav, c->opt_title, c->opt_pgc, c->opt_pg) != DVDNAV_STATUS_OK) { av_log(s, AV_LOG_ERROR, "Unable to start playback at title %d, PGC %d, PG %d\n", c->opt_title, c->opt_pgc, c->opt_pg); @@ -893,8 +901,8 @@ static int dvdvideo_chapters_setup_preindex(AVFormatContext *s) { DVDVideoDemuxContext *c = s->priv_data; - int ret = 0, interrupt = 0; - int nb_chapters = 0, last_ptt = c->opt_chapter_start; + int ret, partn, last_partn; + int interrupt = 0, nb_chapters = 0; uint64_t cur_chapter_offset = 0, cur_chapter_duration = 0; DVDVideoPlaybackState state = {0}; @@ -902,27 +910,38 @@ static int dvdvideo_chapters_setup_preindex(AVFormatContext *s) int is_nav_packet; if (c->opt_chapter_start == c->opt_chapter_end) - return ret; + return 0; - if ((ret = dvdvideo_play_open(s, &state)) < 0) - return ret; + if (c->opt_menu) { + if ((ret = dvdvideo_menu_open(s, &state)) < 0) + return ret; + last_partn = state.celln; + } else { + if ((ret = dvdvideo_play_open(s, &state)) < 0) + return ret; + last_partn = c->opt_chapter_start; + } if (state.pgc->nr_of_programs == 1) goto end_close; - av_log(s, AV_LOG_INFO, - "Indexing chapter markers, this will take a long time. Please wait...\n"); + av_log(s, AV_LOG_INFO, "Indexing chapter markers, this may take a long time. Please wait...\n"); while (!(interrupt = ff_check_interrupt(&s->interrupt_callback))) { - ret = dvdvideo_play_next_ps_block(s, &state, nav_buf, DVDVIDEO_BLOCK_SIZE, - &is_nav_packet); + if (c->opt_menu) + ret = dvdvideo_menu_next_ps_block(s, &state, nav_buf, DVDVIDEO_BLOCK_SIZE, &is_nav_packet); + else + ret = dvdvideo_play_next_ps_block(s, &state, nav_buf, DVDVIDEO_BLOCK_SIZE, &is_nav_packet); + if (ret < 0 && ret != AVERROR_EOF) goto end_close; if (!is_nav_packet && ret != AVERROR_EOF) continue; - if (state.ptt == last_ptt) { + partn = c->opt_menu ? state.celln : state.ptt; + + if (partn == last_partn) { cur_chapter_duration += state.vobu_duration; /* ensure we add the last chapter */ if (ret != AVERROR_EOF) @@ -941,7 +960,7 @@ static int dvdvideo_chapters_setup_preindex(AVFormatContext *s) cur_chapter_offset += cur_chapter_duration; cur_chapter_duration = state.vobu_duration; - last_ptt = state.ptt; + last_partn = partn; if (ret == AVERROR_EOF) break; @@ -961,7 +980,10 @@ static int dvdvideo_chapters_setup_preindex(AVFormatContext *s) ret = 0; end_close: - dvdvideo_play_close(s, &state); + if (c->opt_menu) + dvdvideo_menu_close(s, &state); + else + dvdvideo_play_close(s, &state); return ret; } @@ -1512,47 +1534,47 @@ static int dvdvideo_read_header(AVFormatContext *s) int ret; if (c->opt_menu) { - if (c->opt_region || - c->opt_title > 1 || - c->opt_preindex || - c->opt_chapter_start > 1 || + if (c->opt_region || + c->opt_title > 1 || + c->opt_chapter_start > 1 || c->opt_chapter_end > 0) { - av_log(s, AV_LOG_ERROR, "-menu is not compatible with the -region, -title, " - "-preindex, or -chapter_start/-chapter_end options\n"); + + av_log(s, AV_LOG_ERROR, "Menu mode does not use region, title, or chapter ranges\n"); + return AVERROR(EINVAL); } if (!c->opt_pgc) { - av_log(s, AV_LOG_ERROR, "If -menu is enabled, -pgc must be set to a non-zero value\n"); + av_log(s, AV_LOG_ERROR, "Menu mode requires a PGC number\n"); return AVERROR(EINVAL); } if (!c->opt_menu_lu) { av_log(s, AV_LOG_INFO, "Defaulting to menu language unit #1. " - "This is not always desirable, validation suggested.\n"); + "This is not always the desired menu, validation suggested\n"); c->opt_menu_lu = 1; } - if (!c->opt_pg) { - av_log(s, AV_LOG_INFO, "Defaulting to menu PG #1. " - "This is not always desirable, validation suggested.\n"); - - c->opt_pg = 1; - } - - if ((ret = dvdvideo_ifo_open(s)) < 0 || - (ret = dvdvideo_menu_open(s, &c->play_state)) < 0 || - (ret = dvdvideo_subdemux_open(s)) < 0 || - (ret = dvdvideo_video_stream_setup(s)) < 0 || + if ((ret = dvdvideo_ifo_open(s)) < 0 || + (c->opt_preindex && (ret = dvdvideo_chapters_setup_preindex(s)) < 0) || + (ret = dvdvideo_menu_open(s, &c->play_state)) < 0 || + (ret = dvdvideo_subdemux_open(s)) < 0 || + (ret = dvdvideo_video_stream_setup(s)) < 0 || (ret = dvdvideo_audio_stream_add_all(s)) < 0) return ret; return 0; } - if (c->opt_chapter_end != 0 && c->opt_chapter_start > c->opt_chapter_end) { + if (c->opt_pgc && (c->opt_chapter_start > 1 || c->opt_chapter_end > 0 || c->opt_preindex)) { + av_log(s, AV_LOG_ERROR, "PGC extraction is not compatible with chapter options\n"); + + return AVERROR(EINVAL); + } + + if (!c->opt_pgc && (c->opt_chapter_end != 0 && c->opt_chapter_start > c->opt_chapter_end)) { av_log(s, AV_LOG_ERROR, "Chapter (PTT) range [%d, %d] is invalid\n", c->opt_chapter_start, c->opt_chapter_end); @@ -1561,23 +1583,11 @@ static int dvdvideo_read_header(AVFormatContext *s) if (c->opt_title == 0) { av_log(s, AV_LOG_INFO, "Defaulting to title #1. " - "This is not always the main feature, validation suggested.\n"); + "This is not always the main feature, validation suggested\n"); c->opt_title = 1; } - if (c->opt_pgc) { - if (c->opt_pg == 0) { - av_log(s, AV_LOG_ERROR, "Invalid coordinates. If -pgc is set, -pg must be set too.\n"); - - return AVERROR(EINVAL); - } else if (c->opt_chapter_start > 1 || c->opt_chapter_end > 0 || c->opt_preindex) { - av_log(s, AV_LOG_ERROR, "-pgc is not compatible with the -preindex or " - "-chapter_start/-chapter_end options\n"); - return AVERROR(EINVAL); - } - } - if ((ret = dvdvideo_ifo_open(s)) < 0) return ret; @@ -1751,8 +1761,8 @@ static const AVOption dvdvideo_options[] = { {"chapter_start", "entry chapter (PTT) number", OFFSET(opt_chapter_start), AV_OPT_TYPE_INT, { .i64=1 }, 1, 99, AV_OPT_FLAG_DECODING_PARAM }, {"menu", "demux menu domain", OFFSET(opt_menu), AV_OPT_TYPE_BOOL, { .i64=0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, {"menu_lu", "menu language unit (0=auto)", OFFSET(opt_menu_lu), AV_OPT_TYPE_INT, { .i64=0 }, 0, 99, AV_OPT_FLAG_DECODING_PARAM }, - {"menu_vts", "menu VTS (0=VMG main menu)", OFFSET(opt_menu_vts), AV_OPT_TYPE_INT, { .i64=0 }, 0, 99, AV_OPT_FLAG_DECODING_PARAM }, - {"pg", "entry PG number (0=auto)", OFFSET(opt_pg), AV_OPT_TYPE_INT, { .i64=0 }, 0, 255, AV_OPT_FLAG_DECODING_PARAM }, + {"menu_vts", "menu VTS (0=VMG root menu)", OFFSET(opt_menu_vts), AV_OPT_TYPE_INT, { .i64=1 }, 0, 99, AV_OPT_FLAG_DECODING_PARAM }, + {"pg", "entry PG number when paired with PGC number", OFFSET(opt_pg), AV_OPT_TYPE_INT, { .i64=1 }, 1, 255, AV_OPT_FLAG_DECODING_PARAM }, {"pgc", "entry PGC number (0=auto)", OFFSET(opt_pgc), AV_OPT_TYPE_INT, { .i64=0 }, 0, 999, AV_OPT_FLAG_DECODING_PARAM }, {"preindex", "enable for accurate chapter markers, slow (2-pass read)", OFFSET(opt_preindex), AV_OPT_TYPE_BOOL, { .i64=0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, {"region", "playback region number (0=free)", OFFSET(opt_region), AV_OPT_TYPE_INT, { .i64=0 }, 0, 8, AV_OPT_FLAG_DECODING_PARAM },