Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
37ab7434
Commit
37ab7434
authored
Feb 26, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allowed H264 direct rendering for non reference frames only (avcodec).
parent
b1deb11a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+5
-4
No files found.
modules/codec/avcodec/video.c
View file @
37ab7434
...
@@ -298,8 +298,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
...
@@ -298,8 +298,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_sys
->
i_direct_rendering_used
=
-
1
;
p_sys
->
i_direct_rendering_used
=
-
1
;
if
(
var_CreateGetBool
(
p_dec
,
"ffmpeg-dr"
)
&&
if
(
var_CreateGetBool
(
p_dec
,
"ffmpeg-dr"
)
&&
(
p_sys
->
p_codec
->
capabilities
&
CODEC_CAP_DR1
)
&&
(
p_sys
->
p_codec
->
capabilities
&
CODEC_CAP_DR1
)
&&
/* H264 uses too many reference frames */
p_sys
->
i_codec_id
!=
CODEC_ID_H264
&&
/* No idea why ... but this fixes flickering on some TSCC streams */
/* No idea why ... but this fixes flickering on some TSCC streams */
p_sys
->
i_codec_id
!=
CODEC_ID_TSCC
&&
p_sys
->
i_codec_id
!=
CODEC_ID_TSCC
&&
!
p_sys
->
p_context
->
debug_mv
)
!
p_sys
->
p_context
->
debug_mv
)
...
@@ -923,9 +921,12 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
...
@@ -923,9 +921,12 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
}
}
return
0
;
return
0
;
}
}
else
if
(
!
p_sys
->
b_direct_rendering
)
else
if
(
!
p_sys
->
b_direct_rendering
||
(
p_sys
->
i_codec_id
==
CODEC_ID_H264
&&
p_ff_pic
->
reference
)
)
{
{
/* Not much to do in indirect rendering mode */
/* Not much to do in indirect rendering mode.
* XXX We also do not allow direct rendering with H264 reference frames
* as there can be too many of them. */
return
avcodec_default_get_buffer
(
p_context
,
p_ff_pic
);
return
avcodec_default_get_buffer
(
p_context
,
p_ff_pic
);
}
}
...
...
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