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
14c1f6de
Commit
14c1f6de
authored
Aug 30, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed useless fb-chroma option.
It could not work.
parent
a9e67b18
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
58 deletions
+27
-58
modules/video_output/fb.c
modules/video_output/fb.c
+27
-58
No files found.
modules/video_output/fb.c
View file @
14c1f6de
...
@@ -62,10 +62,6 @@
...
@@ -62,10 +62,6 @@
"Run framebuffer on current TTY device (default enabled). " \
"Run framebuffer on current TTY device (default enabled). " \
"(disable tty handling with caution)" )
"(disable tty handling with caution)" )
#define CHROMA_TEXT N_("Chroma used.")
#define CHROMA_LONGTEXT N_( \
"Force use of a specific chroma for output. Default is I420." )
#define ASPECT_RATIO_TEXT N_("Video aspect ratio")
#define ASPECT_RATIO_TEXT N_("Video aspect ratio")
#define ASPECT_RATIO_LONGTEXT N_( \
#define ASPECT_RATIO_LONGTEXT N_( \
"Aspect ratio of the video image (4:3, 16:9). Default is square pixels." )
"Aspect ratio of the video image (4:3, 16:9). Default is square pixels." )
...
@@ -91,8 +87,7 @@ vlc_module_begin ()
...
@@ -91,8 +87,7 @@ vlc_module_begin ()
add_file
(
FB_DEV_VAR
,
"/dev/fb0"
,
NULL
,
DEVICE_TEXT
,
DEVICE_LONGTEXT
,
add_file
(
FB_DEV_VAR
,
"/dev/fb0"
,
NULL
,
DEVICE_TEXT
,
DEVICE_LONGTEXT
,
false
)
false
)
add_bool
(
"fb-tty"
,
1
,
NULL
,
TTY_TEXT
,
TTY_LONGTEXT
,
true
)
add_bool
(
"fb-tty"
,
1
,
NULL
,
TTY_TEXT
,
TTY_LONGTEXT
,
true
)
add_string
(
"fb-chroma"
,
NULL
,
NULL
,
CHROMA_TEXT
,
CHROMA_LONGTEXT
,
add_obsolete_string
(
"fb-chroma"
);
true
)
add_string
(
"fb-aspect-ratio"
,
NULL
,
NULL
,
ASPECT_RATIO_TEXT
,
add_string
(
"fb-aspect-ratio"
,
NULL
,
NULL
,
ASPECT_RATIO_TEXT
,
ASPECT_RATIO_LONGTEXT
,
true
)
ASPECT_RATIO_LONGTEXT
,
true
)
add_integer
(
"fb-mode"
,
4
,
NULL
,
FB_MODE_TEXT
,
FB_MODE_LONGTEXT
,
add_integer
(
"fb-mode"
,
4
,
NULL
,
FB_MODE_TEXT
,
FB_MODE_LONGTEXT
,
...
@@ -161,7 +156,6 @@ struct vout_sys_t
...
@@ -161,7 +156,6 @@ struct vout_sys_t
int
i_aspect
;
int
i_aspect
;
int
i_bytes_per_pixel
;
int
i_bytes_per_pixel
;
bool
b_auto
;
/* Automatically adjust video size to fb size */
bool
b_auto
;
/* Automatically adjust video size to fb size */
vlc_fourcc_t
i_chroma
;
/* Video memory */
/* Video memory */
uint8_t
*
p_video
;
/* base adress */
uint8_t
*
p_video
;
/* base adress */
...
@@ -211,25 +205,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -211,25 +205,6 @@ static int Open( vlc_object_t *p_this )
#endif
#endif
#endif
#endif
char
*
psz_chroma
=
var_CreateGetNonEmptyString
(
p_vout
,
"fb-chroma"
);
if
(
psz_chroma
)
{
const
vlc_fourcc_t
i_chroma
=
vlc_fourcc_GetCodecFromString
(
VIDEO_ES
,
psz_chroma
);
if
(
i_chroma
)
{
p_sys
->
i_chroma
=
i_chroma
;
msg_Dbg
(
p_vout
,
"forcing chroma '%s'"
,
psz_chroma
);
}
else
{
msg_Warn
(
p_vout
,
"invalid chroma (%s), using defaults."
,
psz_chroma
);
}
free
(
psz_chroma
);
}
p_sys
->
i_aspect
=
-
1
;
p_sys
->
i_aspect
=
-
1
;
char
*
psz_aspect
=
var_CreateGetNonEmptyString
(
p_vout
,
"fb-aspect-ratio"
);
char
*
psz_aspect
=
var_CreateGetNonEmptyString
(
p_vout
,
"fb-aspect-ratio"
);
if
(
psz_aspect
)
if
(
psz_aspect
)
...
@@ -492,8 +467,7 @@ static int Init( vout_thread_t *p_vout )
...
@@ -492,8 +467,7 @@ static int Init( vout_thread_t *p_vout )
p_vout
->
output
.
i_aspect
=
p_vout
->
render
.
i_aspect
;
p_vout
->
output
.
i_aspect
=
p_vout
->
render
.
i_aspect
;
p_vout
->
fmt_out
=
p_vout
->
fmt_in
;
p_vout
->
fmt_out
=
p_vout
->
fmt_in
;
if
(
p_sys
->
i_chroma
==
0
)
{
/* Initialize the output structure: RGB with square pixels, whatever
/* Initialize the output structure: RGB with square pixels, whatever
* the input format is, since it's the only format we know */
* the input format is, since it's the only format we know */
switch
(
p_sys
->
var_info
.
bits_per_pixel
)
switch
(
p_sys
->
var_info
.
bits_per_pixel
)
...
@@ -523,11 +497,6 @@ static int Init( vout_thread_t *p_vout )
...
@@ -523,11 +497,6 @@ static int Init( vout_thread_t *p_vout )
p_vout
->
output
.
i_bmask
=
(
(
1
<<
p_sys
->
var_info
.
blue
.
length
)
-
1
)
p_vout
->
output
.
i_bmask
=
(
(
1
<<
p_sys
->
var_info
.
blue
.
length
)
-
1
)
<<
p_sys
->
var_info
.
blue
.
offset
;
<<
p_sys
->
var_info
.
blue
.
offset
;
}
}
}
else
{
p_vout
->
output
.
i_chroma
=
p_sys
->
i_chroma
;
}
p_vout
->
fmt_out
.
i_chroma
=
p_vout
->
output
.
i_chroma
;
p_vout
->
fmt_out
.
i_chroma
=
p_vout
->
output
.
i_chroma
;
p_vout
->
output
.
i_width
=
p_vout
->
output
.
i_width
=
...
...
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