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
c7c5b9c9
Commit
c7c5b9c9
authored
Feb 26, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added logs about direct rendering usage (avcodec).
parent
c228c356
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
4 deletions
+24
-4
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+24
-4
No files found.
modules/codec/avcodec/video.c
View file @
c7c5b9c9
...
...
@@ -81,6 +81,7 @@ struct decoder_sys_t
/* for direct rendering */
bool
b_direct_rendering
;
int
i_direct_rendering_used
;
bool
b_has_b_frames
;
...
...
@@ -294,6 +295,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
/* ***** ffmpeg direct rendering ***** */
p_sys
->
b_direct_rendering
=
false
;
p_sys
->
i_direct_rendering_used
=
-
1
;
if
(
var_CreateGetBool
(
p_dec
,
"ffmpeg-dr"
)
&&
(
p_sys
->
p_codec
->
capabilities
&
CODEC_CAP_DR1
)
&&
/* Apparently direct rendering doesn't work with YUV422P */
...
...
@@ -313,9 +315,13 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
//if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = false;
if
(
p_sys
->
b_direct_rendering
)
{
msg_Dbg
(
p_dec
,
"
using
direct rendering"
);
msg_Dbg
(
p_dec
,
"
trying to use
direct rendering"
);
p_sys
->
p_context
->
flags
|=
CODEC_FLAG_EMU_EDGE
;
}
else
{
msg_Dbg
(
p_dec
,
"direct rendering is disabled"
);
}
/* Always use our get_buffer wrapper so we can calculate the
* PTS correctly */
...
...
@@ -934,14 +940,14 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
if
(
GetVlcChroma
(
&
p_dec
->
fmt_out
.
video
,
p_context
->
pix_fmt
)
!=
VLC_SUCCESS
||
p_context
->
pix_fmt
==
PIX_FMT_PAL8
)
return
avcodec_default_get_buffer
(
p_context
,
p_ff_pic
)
;
goto
no_dr
;
p_dec
->
fmt_out
.
i_codec
=
p_dec
->
fmt_out
.
video
.
i_chroma
;
/* Get a new picture */
p_pic
=
ffmpeg_NewPictBuf
(
p_dec
,
p_sys
->
p_context
);
if
(
!
p_pic
)
return
avcodec_default_get_buffer
(
p_context
,
p_ff_pic
)
;
goto
no_dr
;
bool
b_compatible
=
true
;
if
(
p_pic
->
p
[
0
].
i_pitch
/
p_pic
->
p
[
0
].
i_pixel_pitch
<
i_width
||
p_pic
->
p
[
0
].
i_lines
<
i_height
)
...
...
@@ -970,7 +976,13 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
if
(
!
b_compatible
)
{
decoder_DeletePicture
(
p_dec
,
p_pic
);
return
avcodec_default_get_buffer
(
p_context
,
p_ff_pic
);
goto
no_dr
;
}
if
(
p_sys
->
i_direct_rendering_used
!=
1
)
{
msg_Dbg
(
p_dec
,
"using direct rendering"
);
p_sys
->
i_direct_rendering_used
=
1
;
}
p_sys
->
p_context
->
draw_horiz_band
=
NULL
;
...
...
@@ -993,6 +1005,14 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
p_ff_pic
->
age
=
256
*
256
*
256
*
64
;
// FIXME FIXME from ffmpeg
return
0
;
no_dr:
if
(
p_sys
->
i_direct_rendering_used
!=
0
)
{
msg_Warn
(
p_dec
,
"disabling direct rendering"
);
p_sys
->
i_direct_rendering_used
=
0
;
}
return
avcodec_default_get_buffer
(
p_context
,
p_ff_pic
);
}
static
int
ffmpeg_ReGetFrameBuf
(
struct
AVCodecContext
*
p_context
,
AVFrame
*
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