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
7de1884e
Commit
7de1884e
authored
Mar 09, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stats: eliminate useless CloseDecoder callback
parent
184e8e76
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
42 deletions
+19
-42
modules/misc/stats/decoder.c
modules/misc/stats/decoder.c
+18
-40
modules/misc/stats/stats.c
modules/misc/stats/stats.c
+1
-1
modules/misc/stats/stats.h
modules/misc/stats/stats.h
+0
-1
No files found.
modules/misc/stats/decoder.c
View file @
7de1884e
...
@@ -21,9 +21,6 @@
...
@@ -21,9 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#ifdef HAVE_CONFIG_H
# include "config.h"
# include "config.h"
#endif
#endif
...
@@ -33,38 +30,6 @@
...
@@ -33,38 +30,6 @@
#include "stats.h"
#include "stats.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static
picture_t
*
DecodeBlock
(
decoder_t
*
p_dec
,
block_t
**
pp_block
);
/*****************************************************************************
* OpenDecoder: Open the decoder
*****************************************************************************/
int
OpenDecoder
(
vlc_object_t
*
p_this
)
{
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
msg_Dbg
(
p_this
,
"opening stats decoder"
);
/* Set callbacks */
p_dec
->
pf_decode_video
=
DecodeBlock
;
p_dec
->
pf_decode_audio
=
NULL
;
p_dec
->
pf_decode_sub
=
NULL
;
/* */
es_format_Init
(
&
p_dec
->
fmt_out
,
VIDEO_ES
,
VLC_CODEC_I420
);
p_dec
->
fmt_out
.
video
.
i_width
=
100
;
p_dec
->
fmt_out
.
video
.
i_height
=
100
;
p_dec
->
fmt_out
.
video
.
i_sar_num
=
1
;
p_dec
->
fmt_out
.
video
.
i_sar_den
=
1
;
return
VLC_SUCCESS
;
}
/****************************************************************************
* RunDecoder: the whole thing
****************************************************************************/
static
picture_t
*
DecodeBlock
(
decoder_t
*
p_dec
,
block_t
**
pp_block
)
static
picture_t
*
DecodeBlock
(
decoder_t
*
p_dec
,
block_t
**
pp_block
)
{
{
block_t
*
p_block
;
block_t
*
p_block
;
...
@@ -98,10 +63,23 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -98,10 +63,23 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
return
p_pic
;
return
p_pic
;
}
}
/*****************************************************************************
int
OpenDecoder
(
vlc_object_t
*
p_this
)
* CloseDecoder: decoder destruction
*****************************************************************************/
void
CloseDecoder
(
vlc_object_t
*
p_this
)
{
{
msg_Dbg
(
p_this
,
"closing stats decoder"
);
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
msg_Dbg
(
p_this
,
"opening stats decoder"
);
/* Set callbacks */
p_dec
->
pf_decode_video
=
DecodeBlock
;
p_dec
->
pf_decode_audio
=
NULL
;
p_dec
->
pf_decode_sub
=
NULL
;
/* */
es_format_Init
(
&
p_dec
->
fmt_out
,
VIDEO_ES
,
VLC_CODEC_I420
);
p_dec
->
fmt_out
.
video
.
i_width
=
100
;
p_dec
->
fmt_out
.
video
.
i_height
=
100
;
p_dec
->
fmt_out
.
video
.
i_sar_num
=
1
;
p_dec
->
fmt_out
.
video
.
i_sar_den
=
1
;
return
VLC_SUCCESS
;
}
}
modules/misc/stats/stats.c
View file @
7de1884e
...
@@ -55,7 +55,7 @@ vlc_module_begin ()
...
@@ -55,7 +55,7 @@ vlc_module_begin ()
set_description
(
N_
(
"Stats decoder function"
)
)
set_description
(
N_
(
"Stats decoder function"
)
)
set_capability
(
"decoder"
,
0
)
set_capability
(
"decoder"
,
0
)
add_shortcut
(
"stats"
)
add_shortcut
(
"stats"
)
set_callbacks
(
OpenDecoder
,
CloseDecoder
)
set_callbacks
(
OpenDecoder
,
NULL
)
add_submodule
()
add_submodule
()
set_section
(
N_
(
"Stats demux"
),
NULL
)
set_section
(
N_
(
"Stats demux"
),
NULL
)
set_description
(
N_
(
"Stats demux function"
)
)
set_description
(
N_
(
"Stats demux function"
)
)
...
...
modules/misc/stats/stats.h
View file @
7de1884e
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
*****************************************************************************/
*****************************************************************************/
int
OpenDecoder
(
vlc_object_t
*
);
int
OpenDecoder
(
vlc_object_t
*
);
void
CloseDecoder
(
vlc_object_t
*
);
int
OpenEncoder
(
vlc_object_t
*
);
int
OpenEncoder
(
vlc_object_t
*
);
void
CloseEncoder
(
vlc_object_t
*
);
void
CloseEncoder
(
vlc_object_t
*
);
...
...
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