Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
afee2b7a
Commit
afee2b7a
authored
Aug 04, 2006
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some cleanup of whitespace
parent
6bfea2fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+9
-7
No files found.
modules/stream_out/transcode.c
View file @
afee2b7a
...
@@ -274,7 +274,7 @@ vlc_module_begin();
...
@@ -274,7 +274,7 @@ vlc_module_begin();
set_section
(
N_
(
"On Screen Display"
),
NULL
);
set_section
(
N_
(
"On Screen Display"
),
NULL
);
add_bool
(
SOUT_CFG_PREFIX
"osd"
,
0
,
NULL
,
OSD_TEXT
,
add_bool
(
SOUT_CFG_PREFIX
"osd"
,
0
,
NULL
,
OSD_TEXT
,
OSD_LONGTEXT
,
VLC_FALSE
);
OSD_LONGTEXT
,
VLC_FALSE
);
set_section
(
N_
(
"Miscellaneous"
),
NULL
);
set_section
(
N_
(
"Miscellaneous"
),
NULL
);
add_integer
(
SOUT_CFG_PREFIX
"threads"
,
0
,
NULL
,
THREADS_TEXT
,
add_integer
(
SOUT_CFG_PREFIX
"threads"
,
0
,
NULL
,
THREADS_TEXT
,
THREADS_LONGTEXT
,
VLC_TRUE
);
THREADS_LONGTEXT
,
VLC_TRUE
);
...
@@ -400,7 +400,7 @@ struct sout_stream_sys_t
...
@@ -400,7 +400,7 @@ struct sout_stream_sys_t
int
i_canvas_width
;
int
i_canvas_width
;
int
i_canvas_height
;
int
i_canvas_height
;
int
i_canvas_aspect
;
int
i_canvas_aspect
;
/* Video, calculated */
/* Video, calculated */
int
i_src_x_offset
;
int
i_src_x_offset
;
int
i_src_y_offset
;
int
i_src_y_offset
;
...
@@ -502,6 +502,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -502,6 +502,7 @@ static int Open( vlc_object_t *p_this )
if
(
p_sys
->
i_acodec
)
if
(
p_sys
->
i_acodec
)
{
{
#if 1
if
(
(
strncmp
(
(
char
*
)
&
p_sys
->
i_acodec
,
"mp3"
,
3
)
==
0
)
&&
if
(
(
strncmp
(
(
char
*
)
&
p_sys
->
i_acodec
,
"mp3"
,
3
)
==
0
)
&&
(
p_sys
->
i_channels
>
2
)
)
(
p_sys
->
i_channels
>
2
)
)
{
{
...
@@ -509,6 +510,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -509,6 +510,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
i_channels
);
p_sys
->
i_channels
);
p_sys
->
i_channels
=
2
;
p_sys
->
i_channels
=
2
;
}
}
#endif
msg_Dbg
(
p_stream
,
"codec audio=%4.4s %dHz %d channels %dKb/s"
,
msg_Dbg
(
p_stream
,
"codec audio=%4.4s %dHz %d channels %dKb/s"
,
(
char
*
)
&
p_sys
->
i_acodec
,
p_sys
->
i_sample_rate
,
(
char
*
)
&
p_sys
->
i_acodec
,
p_sys
->
i_sample_rate
,
p_sys
->
i_channels
,
p_sys
->
i_abitrate
/
1000
);
p_sys
->
i_channels
,
p_sys
->
i_abitrate
/
1000
);
...
@@ -615,12 +617,12 @@ static int Open( vlc_object_t *p_this )
...
@@ -615,12 +617,12 @@ static int Open( vlc_object_t *p_this )
p_sys
->
i_padd_left
=
val
.
i_int
;
p_sys
->
i_padd_left
=
val
.
i_int
;
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"paddright"
,
&
val
);
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"paddright"
,
&
val
);
p_sys
->
i_padd_right
=
val
.
i_int
;
p_sys
->
i_padd_right
=
val
.
i_int
;
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"canvas-width"
,
&
val
);
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"canvas-width"
,
&
val
);
p_sys
->
i_canvas_width
=
val
.
i_int
;
p_sys
->
i_canvas_width
=
val
.
i_int
;
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"canvas-height"
,
&
val
);
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"canvas-height"
,
&
val
);
p_sys
->
i_canvas_height
=
val
.
i_int
;
p_sys
->
i_canvas_height
=
val
.
i_int
;
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"canvas-aspect"
,
&
val
);
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"canvas-aspect"
,
&
val
);
if
(
val
.
psz_string
)
if
(
val
.
psz_string
)
{
{
...
@@ -1420,7 +1422,7 @@ static int transcode_audio_process( sout_stream_t *p_stream,
...
@@ -1420,7 +1422,7 @@ static int transcode_audio_process( sout_stream_t *p_stream,
int
i
;
int
i
;
*
out
=
NULL
;
*
out
=
NULL
;
input_thread_t
*
p_input
=
NULL
;
input_thread_t
*
p_input
=
NULL
;
if
(
p_stream
->
p_parent
->
p_parent
&&
p_stream
->
p_parent
->
p_parent
->
if
(
p_stream
->
p_parent
->
p_parent
&&
p_stream
->
p_parent
->
p_parent
->
i_object_type
==
VLC_OBJECT_INPUT
)
i_object_type
==
VLC_OBJECT_INPUT
)
p_input
=
(
input_thread_t
*
)
p_stream
->
p_parent
->
p_parent
;
p_input
=
(
input_thread_t
*
)
p_stream
->
p_parent
->
p_parent
;
...
@@ -2125,11 +2127,11 @@ static int transcode_video_process( sout_stream_t *p_stream,
...
@@ -2125,11 +2127,11 @@ static int transcode_video_process( sout_stream_t *p_stream,
/* Check if we need a filter for chroma conversion or resizing */
/* Check if we need a filter for chroma conversion or resizing */
if
(
id
->
p_decoder
->
fmt_out
.
video
.
i_chroma
!=
if
(
id
->
p_decoder
->
fmt_out
.
video
.
i_chroma
!=
id
->
p_encoder
->
fmt_in
.
video
.
i_chroma
||
id
->
p_encoder
->
fmt_in
.
video
.
i_chroma
||
(
int
)
id
->
p_decoder
->
fmt_out
.
video
.
i_width
!=
p_sys
->
i_crop_width
||
(
int
)
id
->
p_decoder
->
fmt_out
.
video
.
i_width
!=
p_sys
->
i_crop_width
||
p_sys
->
i_crop_width
!=
p_sys
->
i_nopadd_width
||
p_sys
->
i_crop_width
!=
p_sys
->
i_nopadd_width
||
p_sys
->
i_nopadd_width
!=
(
int
)
id
->
p_encoder
->
fmt_out
.
video
.
i_width
||
p_sys
->
i_nopadd_width
!=
(
int
)
id
->
p_encoder
->
fmt_out
.
video
.
i_width
||
(
int
)
id
->
p_decoder
->
fmt_out
.
video
.
i_height
!=
p_sys
->
i_crop_height
||
(
int
)
id
->
p_decoder
->
fmt_out
.
video
.
i_height
!=
p_sys
->
i_crop_height
||
p_sys
->
i_crop_height
!=
p_sys
->
i_nopadd_height
||
p_sys
->
i_crop_height
!=
p_sys
->
i_nopadd_height
||
p_sys
->
i_nopadd_height
!=
(
int
)
id
->
p_encoder
->
fmt_out
.
video
.
i_height
)
p_sys
->
i_nopadd_height
!=
(
int
)
id
->
p_encoder
->
fmt_out
.
video
.
i_height
)
...
...
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