Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
ba016e18
Commit
ba016e18
authored
5 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
VLCOptions: Sanity checks
parent
610de802
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/util/VLCOptions.java
+7
-5
7 additions, 5 deletions
vlc-android/src/org/videolan/vlc/util/VLCOptions.java
with
7 additions
and
5 deletions
vlc-android/src/org/videolan/vlc/util/VLCOptions.java
+
7
−
5
View file @
ba016e18
...
...
@@ -64,18 +64,18 @@ public class VLCOptions {
final
SharedPreferences
pref
=
Settings
.
INSTANCE
.
getInstance
(
context
);
/* generate an audio session id so as to share audio output with external equalizer */
if
(
Build
.
VERSION
.
SDK_INT
>=
21
&&
AUDIOTRACK_SESSION_ID
==
0
)
{
if
(
context
!=
null
&&
Build
.
VERSION
.
SDK_INT
>=
21
&&
AUDIOTRACK_SESSION_ID
==
0
)
{
AudioManager
audioManager
=
(
AudioManager
)
context
.
getSystemService
(
Context
.
AUDIO_SERVICE
);
AUDIOTRACK_SESSION_ID
=
audioManager
.
generateAudioSessionId
();
}
final
ArrayList
<
String
>
options
=
new
ArrayList
<
String
>(
50
);
final
boolean
timeStrechingDefault
=
context
.
getResources
().
getBoolean
(
R
.
bool
.
time_stretching_default
);
final
boolean
timeStrechingDefault
=
context
!=
null
&&
context
.
getResources
().
getBoolean
(
R
.
bool
.
time_stretching_default
);
final
boolean
timeStreching
=
pref
.
getBoolean
(
"enable_time_stretching_audio"
,
timeStrechingDefault
);
final
String
subtitlesEncoding
=
pref
.
getString
(
"subtitle_text_encoding"
,
""
);
final
boolean
frameSkip
=
pref
.
getBoolean
(
"enable_frame_skip"
,
false
);
final
String
chroma
=
pref
.
getString
(
"chroma_format"
,
context
.
getResources
().
getString
(
R
.
string
.
chroma_format_default
)
);
final
String
chroma
=
pref
.
getString
(
"chroma_format"
,
"RV16"
);
final
boolean
verboseMode
=
pref
.
getBoolean
(
"enable_verbose_mode"
,
true
);
int
deblocking
=
-
1
;
...
...
@@ -124,8 +124,10 @@ public class VLCOptions {
options
.
add
(
"--keystore"
);
if
(
AndroidUtil
.
isMarshMallowOrLater
)
options
.
add
(
"file_crypt,none"
);
else
options
.
add
(
"file_plaintext,none"
);
options
.
add
(
"--keystore-file"
);
options
.
add
(
new
File
(
context
.
getDir
(
"keystore"
,
Context
.
MODE_PRIVATE
),
"file"
).
getAbsolutePath
());
if
(
context
!=
null
)
{
options
.
add
(
"--keystore-file"
);
options
.
add
(
new
File
(
context
.
getDir
(
"keystore"
,
Context
.
MODE_PRIVATE
),
"file"
).
getAbsolutePath
());
}
//Chromecast
options
.
add
(
verboseMode
?
"-vv"
:
"-v"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment