mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/dvdread/dvdreadsrc.c: If we can't read a nav packet, or it doesn't look like a nav packet, that's an error. Prev...

Browse source 
Original commit message from CVS:
* ext/dvdread/dvdreadsrc.c:
If we can't read a nav packet, or it doesn't look like a nav
packet, that's an error.  Previous behavior was to look at
the next packet; I can't find any justification for doing that.
Fixes: #358891.
This commit is contained in:
David Schleef 2007-06-25 07:22:10 +00:00
parent 9905bf5505
commit 9278f9b128
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-06-25 David Schleef <ds@schleef.org>
* ext/dvdread/dvdreadsrc.c:
If we can't read a nav packet, or it doesn't look like a nav
packet, that's an error. Previous behavior was to look at
the next packet; I can't find any justification for doing that.
Fixes: #358891.
2007-06-24 Thomas Vander Stichele <thomas at apestaart dot org> 2007-06-24 Thomas Vander Stichele <thomas at apestaart dot org>
* po/it.po: * po/it.po:

12
ext/dvdread/dvdreadsrc.c
View file

@ -777,21 +777,21 @@ again:
} }
/* read NAV packet */ /* read NAV packet */
nav_retry:
len = DVDReadBlocks (src->dvd_title, src->cur_pack, 1, oneblock); len = DVDReadBlocks (src->dvd_title, src->cur_pack, 1, oneblock);
if (len == 0) if (len == 0)
goto read_error; goto read_error;
if (!gst_dvd_read_src_is_nav_pack (oneblock)) { if (!gst_dvd_read_src_is_nav_pack (oneblock)) {
GST_LOG_OBJECT (src, "Skipping nav packet @ pack %d", src->cur_pack); GST_LOG_OBJECT (src, "Expected nav packet @ pack %d", src->cur_pack);
src->cur_pack++; goto read_error;
goto nav_retry;
} }
/* parse the contained dsi packet */ /* parse the contained dsi packet */
navRead_DSI (&dsi_pack, &oneblock[DSI_START_BYTE]); navRead_DSI (&dsi_pack, &oneblock[DSI_START_BYTE]);
g_assert (src->cur_pack == dsi_pack.dsi_gi.nv_pck_lbn); if (src->cur_pack != dsi_pack.dsi_gi.nv_pck_lbn) {
GST_ERROR ("src->cur_pack = %d, dsi_pack.dsi_gi.nv_pck_lbn = %d",
src->cur_pack, dsi_pack.dsi_gi.nv_pck_lbn);
}
/* determine where we go next. These values are the ones we /* determine where we go next. These values are the ones we
* mostly care about */ * mostly care about */