Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
e384ccdd
Commit
e384ccdd
authored
Jun 08, 2008
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove old post processing code remains from avcodec/video.c.
parent
f7d5f3e7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
40 deletions
+13
-40
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+13
-40
No files found.
modules/codec/avcodec/video.c
View file @
e384ccdd
...
...
@@ -80,12 +80,6 @@ struct decoder_sys_t
int
i_buffer_orig
,
i_buffer
;
char
*
p_buffer_orig
,
*
p_buffer
;
/* Postprocessing handle */
void
*
p_pp
;
bool
b_pp
;
bool
b_pp_async
;
bool
b_pp_init
;
};
/* FIXME (dummy palette for now) */
...
...
@@ -166,7 +160,6 @@ static uint32_t ffmpeg_PixFmtToChroma( int i_ff_chroma )
static
inline
picture_t
*
ffmpeg_NewPictBuf
(
decoder_t
*
p_dec
,
AVCodecContext
*
p_context
)
{
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
picture_t
*
p_pic
;
p_dec
->
fmt_out
.
video
.
i_width
=
p_context
->
width
;
...
...
@@ -220,13 +213,6 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
p_pic
=
p_dec
->
pf_vout_buffer_new
(
p_dec
);
// FIXME if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init )
// FIXME {
// FIXME InitPostproc( p_sys->p_pp, p_context->width,
// FIXME p_context->height, p_context->pix_fmt );
// FIXME p_sys->b_pp_init = true;
// FIXME }
return
p_pic
;
}
...
...
@@ -360,10 +346,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_sys
->
b_direct_rendering
=
1
;
}
p_sys
->
p_pp
=
NULL
;
p_sys
->
b_pp
=
p_sys
->
b_pp_async
=
p_sys
->
b_pp_init
=
false
;
// FIXME p_sys->p_pp = OpenPostproc( p_dec, &p_sys->b_pp_async );
/* ffmpeg doesn't properly release old pictures when frames are skipped */
//if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = 0;
if
(
p_sys
->
b_direct_rendering
)
...
...
@@ -530,9 +512,6 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
* Do the actual decoding now
*/
/* Check if post-processing was enabled */
p_sys
->
b_pp
=
p_sys
->
b_pp_async
;
/* Don't forget that ffmpeg requires a little more bytes
* that the real frame size */
if
(
p_block
->
i_buffer
>
0
)
...
...
@@ -725,7 +704,6 @@ void EndVideoDec( decoder_t *p_dec )
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
if
(
p_sys
->
p_ff_pic
)
av_free
(
p_sys
->
p_ff_pic
);
// FIXME ClosePostproc( p_dec, p_sys->p_pp );
free
(
p_sys
->
p_buffer_orig
);
}
...
...
@@ -820,10 +798,6 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
uint8_t
*
p_dst
,
*
p_src
;
int
i_src_stride
,
i_dst_stride
;
// FIXME if( p_sys->p_pp && p_sys->b_pp )
// FIXME PostprocPict( p_sys->p_pp, p_pic, p_ff_pic );
// FIXME else
{
for
(
i_plane
=
0
;
i_plane
<
p_pic
->
i_planes
;
i_plane
++
)
{
p_src
=
p_ff_pic
->
data
[
i_plane
];
...
...
@@ -841,7 +815,6 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
}
}
}
}
else
{
AVPicture
dest_pic
;
...
...
@@ -926,7 +899,7 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
p_ff_pic
->
opaque
=
0
;
/* Not much to do in indirect rendering mode */
if
(
!
p_sys
->
b_direct_rendering
||
p_sys
->
b_pp
)
if
(
!
p_sys
->
b_direct_rendering
)
{
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