Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
26bcd87e
Commit
26bcd87e
authored
Mar 13, 2014
by
Felix Abecassis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mediacodec: cosmetics
parent
528e0f14
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
modules/codec/omxil/android_mediacodec.c
modules/codec/omxil/android_mediacodec.c
+7
-9
No files found.
modules/codec/omxil/android_mediacodec.c
View file @
26bcd87e
...
@@ -244,7 +244,6 @@ static int OpenDecoder(vlc_object_t *p_this)
...
@@ -244,7 +244,6 @@ static int OpenDecoder(vlc_object_t *p_this)
p_dec
->
pf_decode_video
=
DecodeVideo
;
p_dec
->
pf_decode_video
=
DecodeVideo
;
p_dec
->
fmt_out
.
i_cat
=
p_dec
->
fmt_in
.
i_cat
;
p_dec
->
fmt_out
.
i_cat
=
p_dec
->
fmt_in
.
i_cat
;
p_dec
->
fmt_out
.
video
=
p_dec
->
fmt_in
.
video
;
p_dec
->
fmt_out
.
video
=
p_dec
->
fmt_in
.
video
;
p_dec
->
fmt_out
.
audio
=
p_dec
->
fmt_in
.
audio
;
p_dec
->
fmt_out
.
audio
=
p_dec
->
fmt_in
.
audio
;
...
@@ -508,8 +507,7 @@ static void DisplayBuffer(picture_sys_t* p_picsys, bool b_render)
...
@@ -508,8 +507,7 @@ static void DisplayBuffer(picture_sys_t* p_picsys, bool b_render)
vlc_mutex_lock
(
get_android_opaque_mutex
());
vlc_mutex_lock
(
get_android_opaque_mutex
());
/* Picture might have been invalidated while waiting on the mutex. */
/* Picture might have been invalidated while waiting on the mutex. */
if
(
!
p_picsys
->
b_valid
)
if
(
!
p_picsys
->
b_valid
)
{
{
vlc_mutex_unlock
(
get_android_opaque_mutex
());
vlc_mutex_unlock
(
get_android_opaque_mutex
());
return
;
return
;
}
}
...
@@ -547,8 +545,7 @@ static void InvalidateAllPictures(decoder_t *p_dec)
...
@@ -547,8 +545,7 @@ static void InvalidateAllPictures(decoder_t *p_dec)
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
vlc_mutex_lock
(
get_android_opaque_mutex
());
vlc_mutex_lock
(
get_android_opaque_mutex
());
for
(
int
i
=
0
;
i
<
p_sys
->
i_output_buffers
;
++
i
)
for
(
int
i
=
0
;
i
<
p_sys
->
i_output_buffers
;
++
i
)
{
{
picture_t
*
p_pic
=
p_sys
->
inflight_picture
[
i
];
picture_t
*
p_pic
=
p_sys
->
inflight_picture
[
i
];
if
(
p_pic
)
{
if
(
p_pic
)
{
p_pic
->
p_sys
->
b_valid
=
false
;
p_pic
->
p_sys
->
b_valid
=
false
;
...
@@ -621,7 +618,7 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
...
@@ -621,7 +618,7 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
(
*
env
)
->
CallVoidMethod
(
env
,
p_sys
->
codec
,
p_sys
->
release_output_buffer
,
index
,
false
);
(
*
env
)
->
CallVoidMethod
(
env
,
p_sys
->
codec
,
p_sys
->
release_output_buffer
,
index
,
false
);
jthrowable
exception
=
(
*
env
)
->
ExceptionOccurred
(
env
);
jthrowable
exception
=
(
*
env
)
->
ExceptionOccurred
(
env
);
if
(
exception
!=
NULL
)
{
if
(
exception
!=
NULL
)
{
jclass
illegalStateException
=
(
*
env
)
->
FindClass
(
env
,
"java/lang/IllegalStateException"
);
jclass
illegalStateException
=
(
*
env
)
->
FindClass
(
env
,
"java/lang/IllegalStateException"
);
if
((
*
env
)
->
IsInstanceOf
(
env
,
exception
,
illegalStateException
))
{
if
((
*
env
)
->
IsInstanceOf
(
env
,
exception
,
illegalStateException
))
{
msg_Err
(
p_dec
,
"Codec error (IllegalStateException) in MediaCodec.releaseOutputBuffer"
);
msg_Err
(
p_dec
,
"Codec error (IllegalStateException) in MediaCodec.releaseOutputBuffer"
);
...
@@ -636,8 +633,8 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
...
@@ -636,8 +633,8 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
msg_Warn
(
p_dec
,
"NewPicture failed"
);
msg_Warn
(
p_dec
,
"NewPicture failed"
);
(
*
env
)
->
CallVoidMethod
(
env
,
p_sys
->
codec
,
p_sys
->
release_output_buffer
,
index
,
false
);
(
*
env
)
->
CallVoidMethod
(
env
,
p_sys
->
codec
,
p_sys
->
release_output_buffer
,
index
,
false
);
}
}
return
;
return
;
}
else
if
(
index
==
INFO_OUTPUT_BUFFERS_CHANGED
)
{
}
else
if
(
index
==
INFO_OUTPUT_BUFFERS_CHANGED
)
{
msg_Dbg
(
p_dec
,
"output buffers changed"
);
msg_Dbg
(
p_dec
,
"output buffers changed"
);
(
*
env
)
->
DeleteGlobalRef
(
env
,
p_sys
->
output_buffers
);
(
*
env
)
->
DeleteGlobalRef
(
env
,
p_sys
->
output_buffers
);
...
@@ -653,7 +650,6 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
...
@@ -653,7 +650,6 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
vlc_mutex_unlock
(
get_android_opaque_mutex
());
vlc_mutex_unlock
(
get_android_opaque_mutex
());
}
else
if
(
index
==
INFO_OUTPUT_FORMAT_CHANGED
)
{
}
else
if
(
index
==
INFO_OUTPUT_FORMAT_CHANGED
)
{
jobject
format
=
(
*
env
)
->
CallObjectMethod
(
env
,
p_sys
->
codec
,
p_sys
->
get_output_format
);
jobject
format
=
(
*
env
)
->
CallObjectMethod
(
env
,
p_sys
->
codec
,
p_sys
->
get_output_format
);
jobject
format_string
=
(
*
env
)
->
CallObjectMethod
(
env
,
format
,
p_sys
->
tostring
);
jobject
format_string
=
(
*
env
)
->
CallObjectMethod
(
env
,
format
,
p_sys
->
tostring
);
...
@@ -782,6 +778,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
...
@@ -782,6 +778,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
p_sys
->
error_state
=
true
;
p_sys
->
error_state
=
true
;
break
;
break
;
}
}
if
(
index
<
0
)
{
if
(
index
<
0
)
{
GetOutput
(
p_dec
,
env
,
&
p_pic
,
timeout
);
GetOutput
(
p_dec
,
env
,
&
p_pic
,
timeout
);
if
(
p_pic
)
{
if
(
p_pic
)
{
...
@@ -793,7 +790,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
...
@@ -793,7 +790,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
(
*
myVm
)
->
DetachCurrentThread
(
myVm
);
(
*
myVm
)
->
DetachCurrentThread
(
myVm
);
return
p_pic
;
return
p_pic
;
}
}
timeout
=
30
*
1000
;
timeout
=
30
*
1000
;
++
attempts
;
++
attempts
;
/* With opaque DR the output buffers are released by the
/* With opaque DR the output buffers are released by the
vout therefore we implement a timeout for polling in
vout therefore we implement a timeout for polling in
...
@@ -821,6 +818,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
...
@@ -821,6 +818,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
}
}
continue
;
continue
;
}
}
jobject
buf
=
(
*
env
)
->
GetObjectArrayElement
(
env
,
p_sys
->
input_buffers
,
index
);
jobject
buf
=
(
*
env
)
->
GetObjectArrayElement
(
env
,
p_sys
->
input_buffers
,
index
);
jsize
size
=
(
*
env
)
->
GetDirectBufferCapacity
(
env
,
buf
);
jsize
size
=
(
*
env
)
->
GetDirectBufferCapacity
(
env
,
buf
);
uint8_t
*
bufptr
=
(
*
env
)
->
GetDirectBufferAddress
(
env
,
buf
);
uint8_t
*
bufptr
=
(
*
env
)
->
GetDirectBufferAddress
(
env
,
buf
);
...
...
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