Skip to content

Commit 05afd35

Browse files
committed
Reformat with google-java-format
1 parent 0717179 commit 05afd35

File tree

6 files changed

+14
-31
lines changed

6 files changed

+14
-31
lines changed

libraries/common/src/main/java/androidx/media3/common/text/Cue.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,7 @@ public final class Cue {
309309
*/
310310
public final float shearDegrees;
311311

312-
/**
313-
* The z index for cue, the larger index will render above the smaller index.
314-
*/
312+
/** The z index for cue, the larger index will render above the smaller index. */
315313
public final int zIndex;
316314

317315
private Cue(
@@ -824,9 +822,7 @@ public Builder setZIndex(int zIndex) {
824822
return this;
825823
}
826824

827-
/**
828-
* Gets the zIndex for this Cue.
829-
*/
825+
/** Gets the zIndex for this Cue. */
830826
@Pure
831827
public int getZIndex() {
832828
return zIndex;

libraries/common/src/main/java/androidx/media3/common/text/CueGroup.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
/** Class to represent the state of active {@link Cue Cues} at a particular time. */
3131
public final class CueGroup {
3232

33-
/**
34-
* An {@link Ordering} which sorts cues in ascending zIndex priority
35-
*/
33+
/** An {@link Ordering} which sorts cues in ascending zIndex priority */
3634
private static final Ordering<Cue> CUES_PRIORITY_COMPARATOR =
3735
Ordering.<Integer>natural().onResultOf(c -> c.zIndex);
3836

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SsaPlaybackTest.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
*/
1616
package androidx.media3.exoplayer.e2etest;
1717

18-
import static androidx.media3.test.utils.robolectric.TestPlayerRunHelper.play;
1918
import static androidx.media3.test.utils.robolectric.TestPlayerRunHelper.run;
20-
import static com.google.common.truth.Truth.assertThat;
2119

2220
import android.content.Context;
2321
import android.graphics.SurfaceTexture;
@@ -27,28 +25,14 @@
2725
import androidx.media3.common.MediaItem;
2826
import androidx.media3.common.MimeTypes;
2927
import androidx.media3.common.Player;
30-
import androidx.media3.common.text.CueGroup;
31-
import androidx.media3.common.util.Clock;
32-
import androidx.media3.common.util.Util;
33-
import androidx.media3.exoplayer.DefaultLoadControl;
34-
import androidx.media3.exoplayer.DefaultRenderersFactory;
35-
import androidx.media3.exoplayer.ExoPlaybackException;
3628
import androidx.media3.exoplayer.ExoPlayer;
37-
import androidx.media3.exoplayer.RenderersFactory;
38-
import androidx.media3.exoplayer.source.DefaultMediaSourceFactory;
39-
import androidx.media3.exoplayer.source.MediaSource;
40-
import androidx.media3.exoplayer.text.TextRenderer;
4129
import androidx.media3.test.utils.CapturingRenderersFactory;
4230
import androidx.media3.test.utils.DumpFileAsserts;
4331
import androidx.media3.test.utils.FakeClock;
4432
import androidx.media3.test.utils.robolectric.PlaybackOutput;
45-
import androidx.media3.test.utils.robolectric.RobolectricUtil;
4633
import androidx.media3.test.utils.robolectric.ShadowMediaCodecConfig;
47-
import androidx.media3.test.utils.robolectric.TestPlayerRunHelper;
4834
import androidx.test.core.app.ApplicationProvider;
4935
import com.google.common.collect.ImmutableList;
50-
import java.util.concurrent.TimeoutException;
51-
import java.util.concurrent.atomic.AtomicBoolean;
5236
import org.junit.Rule;
5337
import org.junit.Test;
5438
import org.junit.runner.RunWith;

libraries/extractor/src/main/java/androidx/media3/extractor/text/ssa/SsaDialogueFormat.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@
4040
public final int length;
4141

4242
private SsaDialogueFormat(
43-
int layerIndex, int startTimeIndex, int endTimeIndex, int styleIndex, int textIndex, int length) {
43+
int layerIndex,
44+
int startTimeIndex,
45+
int endTimeIndex,
46+
int styleIndex,
47+
int textIndex,
48+
int length) {
4449
this.layerIndex = layerIndex;
4550
this.startTimeIndex = startTimeIndex;
4651
this.endTimeIndex = endTimeIndex;
@@ -85,7 +90,8 @@ public static SsaDialogueFormat fromFormatLine(String formatLine) {
8590
return (startTimeIndex != C.INDEX_UNSET
8691
&& endTimeIndex != C.INDEX_UNSET
8792
&& textIndex != C.INDEX_UNSET)
88-
? new SsaDialogueFormat(layerIndex, startTimeIndex, endTimeIndex, styleIndex, textIndex, keys.length)
93+
? new SsaDialogueFormat(
94+
layerIndex, startTimeIndex, endTimeIndex, styleIndex, textIndex, keys.length)
8995
: null;
9096
}
9197
}

libraries/extractor/src/main/java/androidx/media3/extractor/text/ssa/SsaParser.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,7 @@ private static Cue createCue(
397397
float screenWidth,
398398
float screenHeight) {
399399
SpannableString spannableText = new SpannableString(text);
400-
Cue.Builder cue = new Cue.Builder()
401-
.setText(spannableText)
402-
.setZIndex(layer);
400+
Cue.Builder cue = new Cue.Builder().setText(spannableText).setZIndex(layer);
403401

404402
if (style != null) {
405403
if (style.primaryColor != null) {

libraries/extractor/src/test/java/androidx/media3/extractor/text/ssa/SsaParserTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,8 @@ public void parseLayer() throws IOException {
429429
@Test
430430
public void parseInvalidLayer() throws IOException {
431431
SsaParser parser = new SsaParser();
432-
byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), INVALID_LAYERS);
432+
byte[] bytes =
433+
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), INVALID_LAYERS);
433434
ImmutableList<CuesWithTiming> allCues = parseAllCues(parser, bytes);
434435

435436
// Check empty layer.

0 commit comments

Comments
 (0)