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
ee2af43a
authored
May 26, 2021
by
olly
Committed by
Oliver Woodman
May 27, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix file formatting
PiperOrigin-RevId: 375919564
parent
4b0c9876
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
extensions/flac/src/main/jni/flac_parser.cc
extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
library/common/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataLoadable.java
extensions/flac/src/main/jni/flac_parser.cc
View file @
ee2af43a
...
...
@@ -16,9 +16,8 @@
#include "include/flac_parser.h"
#include <jni.h>
#include <android/log.h>
#include <jni.h>
#include <cassert>
#include <cstdlib>
...
...
@@ -431,7 +430,7 @@ bool FLACParser::getSeekPositions(int64_t timeUs,
targetSampleNumber
=
totalSamples
-
1
;
}
FLAC__StreamMetadata_SeekPoint
*
points
=
mSeekTable
->
points
;
FLAC__StreamMetadata_SeekPoint
*
points
=
mSeekTable
->
points
;
unsigned
length
=
mSeekTable
->
num_points
;
for
(
unsigned
i
=
length
;
i
!=
0
;
i
--
)
{
...
...
extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
View file @
ee2af43a
...
...
@@ -64,8 +64,8 @@ public class GvrAudioProcessor implements AudioProcessor {
}
/**
* Updates the listener head orientation. May be called on any thread. See
*
{@code
GvrAudioSurround.updateNativeOrientation}.
* Updates the listener head orientation. May be called on any thread. See
{@code
* GvrAudioSurround.updateNativeOrientation}.
*
* @param w The w component of the quaternion.
* @param x The x component of the quaternion.
...
...
@@ -113,8 +113,9 @@ public class GvrAudioProcessor implements AudioProcessor {
throw
new
UnhandledAudioFormatException
(
inputAudioFormat
);
}
if
(
buffer
==
EMPTY_BUFFER
)
{
buffer
=
ByteBuffer
.
allocateDirect
(
FRAMES_PER_OUTPUT_BUFFER
*
OUTPUT_FRAME_SIZE
)
.
order
(
ByteOrder
.
nativeOrder
());
buffer
=
ByteBuffer
.
allocateDirect
(
FRAMES_PER_OUTPUT_BUFFER
*
OUTPUT_FRAME_SIZE
)
.
order
(
ByteOrder
.
nativeOrder
());
}
pendingInputAudioFormat
=
inputAudioFormat
;
return
new
AudioFormat
(
inputAudioFormat
.
sampleRate
,
OUTPUT_CHANNEL_COUNT
,
C
.
ENCODING_PCM_16BIT
);
...
...
@@ -192,5 +193,4 @@ public class GvrAudioProcessor implements AudioProcessor {
gvrAudioSurround
=
null
;
}
}
}
library/common/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
View file @
ee2af43a
...
...
@@ -432,5 +432,4 @@ public final class ExoPlaybackException extends PlaybackException {
bundle
.
putBoolean
(
keyForField
(
FIELD_IS_RECOVERABLE
),
isRecoverable
);
return
bundle
;
}
}
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataLoadable.java
View file @
ee2af43a
...
...
@@ -57,7 +57,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
void
onTransportReady
(
String
transport
,
RtpDataChannel
rtpDataChannel
);
}
/** The track ID associated with the Loadable. */
public
final
int
trackId
;
/** The {@link RtspMediaTrack} to load. */
...
...
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