highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/dvdvideodec: fix -pgc and -pg options

Browse Source 
Rebased on top of recently merged fixes (should apply correctly now).

In merged DVD patch, -pgc and -pg options were broken. While these are
rather advanced options, they are the only means to get content for
some strangely authored discs.

Signed-off-by: Marth64 <marth64@proxyid.net>
This commit is contained in:
Marth64
2024-03-03 02:45:41 -06:00
committed by Stefano Sabatini
parent e30369bc1c
commit 01476f752a
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/dvdvideodec.c
View File

@@ -507,11 +507,12 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState
state->celln, e_cell->cellN, is_cell_promising); state->celln, e_cell->cellN, is_cell_promising);
if (!state->in_ps && !state->in_pgc) { if (!state->in_ps && !state->in_pgc) {
if (cur_title == c->opt_title && if (cur_title == c->opt_title &&
cur_ptt == c->opt_chapter_start && (c->opt_pgc || cur_ptt == c->opt_chapter_start) &&
cur_pgcn == state->pgcn && cur_pgcn == state->pgcn &&
cur_pgn == state->entry_pgn && cur_pgn == state->entry_pgn &&
is_cell_promising) { is_cell_promising) {
state->in_pgc = 1; state->in_pgc = 1;
} }
@@ -1254,19 +1255,21 @@ static int dvdvideo_read_header(AVFormatContext *s)
} }
if (c->opt_pgc) { if (c->opt_pgc) {
if (c->opt_pg == 0) if (c->opt_pg == 0) {
av_log(s, AV_LOG_ERROR, "Invalid coordinates. If -pgc is set, -pg must be set too.\n"); av_log(s, AV_LOG_ERROR, "Invalid coordinates. If -pgc is set, -pg must be set too.\n");
else if (c->opt_chapter_start > 1 || c->opt_chapter_end > 0 || c->opt_preindex)
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 " av_log(s, AV_LOG_ERROR, "-pgc is not compatible with the -preindex or "
"-chapter_start/-chapter_end options\n"); "-chapter_start/-chapter_end options\n");
return AVERROR(EINVAL);
return AVERROR(EINVAL); }
} }
if ((ret = dvdvideo_ifo_open(s)) < 0) if ((ret = dvdvideo_ifo_open(s)) < 0)
return ret; return ret;
if (c->opt_preindex && (ret = dvdvideo_chapters_setup_preindex(s)) < 0) if (!c->opt_pgc && c->opt_preindex && (ret = dvdvideo_chapters_setup_preindex(s)) < 0)
return ret; return ret;
if ((ret = dvdvideo_play_open(s, &c->play_state)) < 0 || if ((ret = dvdvideo_play_open(s, &c->play_state)) < 0 ||
@@ -1276,7 +1279,7 @@ static int dvdvideo_read_header(AVFormatContext *s)
(ret = dvdvideo_subp_stream_add_all(s)) < 0) (ret = dvdvideo_subp_stream_add_all(s)) < 0)
return ret; return ret;
if (!c->opt_preindex) if (!c->opt_pgc && !c->opt_preindex)
return dvdvideo_chapters_setup_simple(s); return dvdvideo_chapters_setup_simple(s);
return 0; return 0;