mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

simplifications, any error from libnut is fatal

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19964 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ods15 2006-09-23 21:05:28 +00:00
parent dcc0b8e177
commit b45efb0eeb
1 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libmpdemux/demux_nut.c
View File

@ -180,25 +180,12 @@ static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) {
demuxer->filepos = stream_tell(demuxer->stream);
if (stream_eof(demuxer->stream)) return 0;
while (1) {
ret = nut_read_next_packet(nut, &pd);
if (ret < 0) {
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(-ret));
continue;
}
if (ret == 1) return 0; // EOF
if (pd.type == e_frame) break;
// else, skip this packet
while ((ret = nut_skip_packet(nut, &pd.len))) {
if (ret < 0) {
mp_msg(MSGT_HEADER, MSGL_ERR,
"NUT error: %s\n", nut_error(-ret));
break;
}
if (ret == 1) return 0; // EOF
}
}
if (ret) return 0; // fatal error
pts = (double)pd.pts * priv->s[pd.stream].time_base.nom /
priv->s[pd.stream].time_base.den;
@ -213,14 +200,12 @@ static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) {
ds = demuxer->video;
}
else {
while ((ret = nut_skip_packet(nut, &pd.len))) {
ret = nut_skip_packet(nut, &pd.len);
if (ret < 0) {
mp_msg(MSGT_HEADER, MSGL_ERR,
"NUT error: %s\n", nut_error(-ret));
break;
}
if (ret == 1) return 0; // EOF
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(-ret));
}
if (ret) return 0; // fatal error
return 1;
}
@ -233,14 +218,13 @@ static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) {
dp->pos = demuxer->filepos;
dp->flags= (pd.flags & NUT_FLAG_KEY) ? 0x10 : 0;
while ((ret = nut_read_frame(nut, &pd.len, dp->buffer))) {
ret = nut_read_frame(nut, &pd.len, dp->buffer);
if (ret < 0) {
mp_msg(MSGT_HEADER, MSGL_ERR,
"NUT error: %s\n", nut_error(-ret));
break;
}
if (ret == 1) return 0; // EOF
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(-ret));
}
if (ret) return 0; // fatal error
ds_add_packet(ds, dp); // append packet to DS stream
return 1;
}