Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
070fbff5
Commit
070fbff5
authored
Apr 26, 2003
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ffmpeg: we always skip video if we have more than 5 second of late video.
(This should avoid 'decoder stuck' message.)
parent
ee2bc403
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
4 deletions
+26
-4
modules/codec/ffmpeg/video.c
modules/codec/ffmpeg/video.c
+23
-2
modules/codec/ffmpeg/video.h
modules/codec/ffmpeg/video.h
+3
-2
No files found.
modules/codec/ffmpeg/video.c
View file @
070fbff5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library
* video.c: video decoder using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.2
1 2003/04/20 11:57:13 gbazin
Exp $
* $Id: video.c,v 1.2
2 2003/04/26 21:45:26 fenrir
Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
* Gildas Bazin <gbazin@netcourrier.com>
...
@@ -439,9 +439,26 @@ void E_( DecodeThread_Video )( vdec_thread_t *p_vdec )
...
@@ -439,9 +439,26 @@ void E_( DecodeThread_Video )( vdec_thread_t *p_vdec )
p_vdec
->
p_context
->
hurry_up
=
0
;
p_vdec
->
p_context
->
hurry_up
=
0
;
}
}
if
(
p_vdec
->
i_frame_late
>
0
&&
mdate
()
-
p_vdec
->
i_frame_late_start
>
(
mtime_t
)
5000000
)
{
msg_Err
(
p_vdec
->
p_fifo
,
"more than 5 second of late video -> dropping (to slow computer ?)"
);
do
{
input_ExtractPES
(
p_vdec
->
p_fifo
,
&
p_pes
);
if
(
!
p_pes
)
{
p_vdec
->
p_fifo
->
b_error
=
1
;
return
;
}
i_pts
=
p_pes
->
i_pts
;
input_DeletePES
(
p_vdec
->
p_fifo
->
p_packets_mgt
,
p_pes
);
}
while
(
i_pts
<=
0
||
i_pts
<
mdate
()
+
DEFAULT_PTS_DELAY
);
}
if
(
!
p_vdec
->
p_context
->
width
||
!
p_vdec
->
p_context
->
height
)
if
(
!
p_vdec
->
p_context
->
width
||
!
p_vdec
->
p_context
->
height
)
{
{
p_vdec
->
p_context
->
hurry_up
=
5
;
p_vdec
->
p_context
->
hurry_up
=
5
;
}
}
do
do
...
@@ -554,6 +571,10 @@ usenextdata:
...
@@ -554,6 +571,10 @@ usenextdata:
if
(
p_vdec
->
pts
<=
mdate
()
)
if
(
p_vdec
->
pts
<=
mdate
()
)
{
{
p_vdec
->
i_frame_late
++
;
p_vdec
->
i_frame_late
++
;
if
(
p_vdec
->
i_frame_late
==
1
)
{
p_vdec
->
i_frame_late_start
=
mdate
();
}
}
}
else
else
{
{
...
...
modules/codec/ffmpeg/video.h
View file @
070fbff5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* video.h: video decoder using ffmpeg library
* video.h: video decoder using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.h,v 1.
7 2003/04/17 10:58:30
fenrir Exp $
* $Id: video.h,v 1.
8 2003/04/26 21:45:26
fenrir Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -43,7 +43,8 @@ typedef struct vdec_thread_s
...
@@ -43,7 +43,8 @@ typedef struct vdec_thread_s
int
b_hurry_up
;
int
b_hurry_up
;
int
i_frame_error
;
int
i_frame_error
;
int
i_frame_skip
;
int
i_frame_skip
;
int
i_frame_late
;
/* how many decoded frames are late */
int
i_frame_late
;
/* how many decoded frames are late */
mtime_t
i_frame_late_start
;
int
i_frame_count
;
/* to emulate pts */
int
i_frame_count
;
/* to emulate pts */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment