Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
453bd392
authored
Dec 18, 2019
by
olly
Committed by
Oliver Woodman
Dec 19, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix typo in class name
PiperOrigin-RevId: 286225012
parent
ed1de000
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsynchMediaCodecAdapter.java → library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View file @
453bd392
...
...
@@ -998,8 +998,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
((
DedicatedThreadAsyncMediaCodecAdapter
)
codecAdapter
).
start
();
}
else
if
(
mediaCodecOperationMode
==
OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD_MULTI_LOCK
&&
Util
.
SDK_INT
>=
23
)
{
codecAdapter
=
new
MultiLockAsync
h
MediaCodecAdapter
(
codec
,
getTrackType
());
((
MultiLockAsync
h
MediaCodecAdapter
)
codecAdapter
).
start
();
codecAdapter
=
new
MultiLockAsyncMediaCodecAdapter
(
codec
,
getTrackType
());
((
MultiLockAsyncMediaCodecAdapter
)
codecAdapter
).
start
();
}
else
{
codecAdapter
=
new
SynchronousMediaCodecAdapter
(
codec
,
getDequeueOutputBufferTimeoutUs
());
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsync
h
MediaCodecAdapter.java
→
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
View file @
453bd392
...
...
@@ -51,7 +51,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* <p>After creating an instance, you need to call {@link #start()} to start the internal Thread.
*/
@RequiresApi
(
23
)
/* package */
final
class
MultiLockAsync
h
MediaCodecAdapter
extends
MediaCodec
.
Callback
/* package */
final
class
MultiLockAsyncMediaCodecAdapter
extends
MediaCodec
.
Callback
implements
MediaCodecAdapter
{
@IntDef
({
STATE_CREATED
,
STATE_STARTED
,
STATE_SHUT_DOWN
})
...
...
@@ -97,12 +97,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private
Runnable
onCodecStart
;
/** Creates a new instance that wraps the specified {@link MediaCodec}. */
/* package */
MultiLockAsync
h
MediaCodecAdapter
(
MediaCodec
codec
,
int
trackType
)
{
/* package */
MultiLockAsyncMediaCodecAdapter
(
MediaCodec
codec
,
int
trackType
)
{
this
(
codec
,
new
HandlerThread
(
createThreadLabel
(
trackType
)));
}
@VisibleForTesting
/* package */
MultiLockAsync
h
MediaCodecAdapter
(
MediaCodec
codec
,
HandlerThread
handlerThread
)
{
/* package */
MultiLockAsyncMediaCodecAdapter
(
MediaCodec
codec
,
HandlerThread
handlerThread
)
{
this
.
codec
=
codec
;
inputBufferLock
=
new
Object
();
outputBufferLock
=
new
Object
();
...
...
library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
View file @
453bd392
...
...
@@ -38,10 +38,10 @@ import org.junit.Test;
import
org.junit.runner.RunWith
;
import
org.robolectric.shadows.ShadowLooper
;
/** Unit tests for {@link MultiLockAsync
h
MediaCodecAdapter}. */
/** Unit tests for {@link MultiLockAsyncMediaCodecAdapter}. */
@RunWith
(
AndroidJUnit4
.
class
)
public
class
MultiLockAsyncMediaCodecAdapterTest
{
private
MultiLockAsync
h
MediaCodecAdapter
adapter
;
private
MultiLockAsyncMediaCodecAdapter
adapter
;
private
MediaCodec
codec
;
private
MediaCodec
.
BufferInfo
bufferInfo
=
null
;
private
MediaCodecAsyncCallback
mediaCodecAsyncCallbackSpy
;
...
...
@@ -51,7 +51,7 @@ public class MultiLockAsyncMediaCodecAdapterTest {
public
void
setup
()
throws
IOException
{
codec
=
MediaCodec
.
createByCodecName
(
"h264"
);
handlerThread
=
new
TestHandlerThread
(
"TestHandlerThread"
);
adapter
=
new
MultiLockAsync
h
MediaCodecAdapter
(
codec
,
handlerThread
);
adapter
=
new
MultiLockAsyncMediaCodecAdapter
(
codec
,
handlerThread
);
bufferInfo
=
new
MediaCodec
.
BufferInfo
();
}
...
...
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