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
a2590d21
Commit
a2590d21
authored
Apr 07, 2006
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/codec/spudec: Decreased verbosity.
parent
cd67f552
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
modules/codec/spudec/parse.c
modules/codec/spudec/parse.c
+8
-0
modules/codec/spudec/spudec.c
modules/codec/spudec/spudec.c
+3
-2
modules/codec/spudec/spudec.h
modules/codec/spudec/spudec.h
+2
-0
No files found.
modules/codec/spudec/parse.c
View file @
a2590d21
...
@@ -111,9 +111,11 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
...
@@ -111,9 +111,11 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
return
NULL
;
return
NULL
;
}
}
#ifdef DEBUG_SPUDEC
msg_Dbg
(
p_dec
,
"total size: 0x%x, RLE offsets: 0x%x 0x%x"
,
msg_Dbg
(
p_dec
,
"total size: 0x%x, RLE offsets: 0x%x 0x%x"
,
p_sys
->
i_spu_size
,
p_sys
->
i_spu_size
,
p_spu_data
->
pi_offset
[
0
],
p_spu_data
->
pi_offset
[
1
]
);
p_spu_data
->
pi_offset
[
0
],
p_spu_data
->
pi_offset
[
1
]
);
#endif
Render
(
p_dec
,
p_spu
,
p_spu_data
);
Render
(
p_dec
,
p_spu
,
p_spu_data
);
free
(
p_spu_data
);
free
(
p_spu_data
);
...
@@ -546,8 +548,10 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
...
@@ -546,8 +548,10 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
#ifdef DEBUG_SPUDEC
msg_Dbg
(
p_dec
,
"valid subtitle, size: %ix%i, position: %i,%i"
,
msg_Dbg
(
p_dec
,
"valid subtitle, size: %ix%i, position: %i,%i"
,
p_spu
->
i_width
,
p_spu
->
i_height
,
p_spu
->
i_x
,
p_spu
->
i_y
);
p_spu
->
i_width
,
p_spu
->
i_height
,
p_spu
->
i_x
,
p_spu
->
i_y
);
#endif
/* Crop if necessary */
/* Crop if necessary */
if
(
i_skipped_top
||
i_skipped_bottom
)
if
(
i_skipped_top
||
i_skipped_bottom
)
...
@@ -557,8 +561,10 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
...
@@ -557,8 +561,10 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
p_spu_data
->
i_y_top_offset
=
i_skipped_top
;
p_spu_data
->
i_y_top_offset
=
i_skipped_top
;
p_spu_data
->
i_y_bottom_offset
=
i_skipped_bottom
;
p_spu_data
->
i_y_bottom_offset
=
i_skipped_bottom
;
#ifdef DEBUG_SPUDEC
msg_Dbg
(
p_dec
,
"cropped to: %ix%i, position: %i,%i"
,
msg_Dbg
(
p_dec
,
"cropped to: %ix%i, position: %i,%i"
,
p_spu
->
i_width
,
i_height
,
p_spu
->
i_x
,
i_y
);
p_spu
->
i_width
,
i_height
,
p_spu
->
i_x
,
i_y
);
#endif
}
}
/* Handle color if no palette was found */
/* Handle color if no palette was found */
...
@@ -613,8 +619,10 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
...
@@ -613,8 +619,10 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
p_spu_data
->
pi_yuv
[
i_shade
][
2
]
=
0x80
;
p_spu_data
->
pi_yuv
[
i_shade
][
2
]
=
0x80
;
}
}
#ifdef DEBUG_SPUDEC
msg_Dbg
(
p_dec
,
"using custom palette (border %i, inner %i, shade %i)"
,
msg_Dbg
(
p_dec
,
"using custom palette (border %i, inner %i, shade %i)"
,
i_border
,
i_inner
,
i_shade
);
i_border
,
i_inner
,
i_shade
);
#endif
}
}
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
modules/codec/spudec/spudec.c
View file @
a2590d21
...
@@ -235,8 +235,9 @@ static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block )
...
@@ -235,8 +235,9 @@ static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block )
if
(
p_sys
->
i_spu
>=
p_sys
->
i_spu_size
)
if
(
p_sys
->
i_spu
>=
p_sys
->
i_spu_size
)
{
{
/* We have a complete sub */
/* We have a complete sub */
msg_Dbg
(
p_dec
,
"SPU packets size=%d should be %d"
,
if
(
p_sys
->
i_spu
>
p_sys
->
i_spu_size
)
p_sys
->
i_spu
,
p_sys
->
i_spu_size
);
msg_Dbg
(
p_dec
,
"SPU packets size=%d should be %d"
,
p_sys
->
i_spu
,
p_sys
->
i_spu_size
);
return
p_sys
->
p_block
;
return
p_sys
->
p_block
;
}
}
...
...
modules/codec/spudec/spudec.h
View file @
a2590d21
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
*****************************************************************************/
/* #define DEBUG_SPUDEC 1 */
struct
decoder_sys_t
struct
decoder_sys_t
{
{
int
b_packetizer
;
int
b_packetizer
;
...
...
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