loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automated Code Change

Browse Source 
PiperOrigin-RevId: 662793513
This commit is contained in:
kak 2024-08-13 23:29:59 -07:00 committed by Copybara-Service
parent 68393832b4
commit e7f037bff5
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/image/ExternallyLoadedImageDecoder.java
View File

@ -27,10 +27,10 @@ import androidx.media3.common.MimeTypes;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.decoder.DecoderInputBuffer; import androidx.media3.decoder.DecoderInputBuffer;
import androidx.media3.exoplayer.RendererCapabilities; import androidx.media3.exoplayer.RendererCapabilities;
import com.google.common.base.Charsets;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -153,7 +153,10 @@ public final class ExternallyLoadedImageDecoder implements ImageDecoder {
Uri imageUri = Uri imageUri =
Uri.parse( Uri.parse(
new String( new String(
inputData.array(), inputData.arrayOffset(), inputData.remaining(), Charsets.UTF_8)); inputData.array(),
inputData.arrayOffset(),
inputData.remaining(),
StandardCharsets.UTF_8));
pendingDecode = bitmapResolver.resolve(new ExternalImageRequest(imageUri)); pendingDecode = bitmapResolver.resolve(new ExternalImageRequest(imageUri));
pendingDecodeTimeUs = inputBuffer.timeUs; pendingDecodeTimeUs = inputBuffer.timeUs;
inputBuffer.clear(); inputBuffer.clear();

26
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/image/ExternallyLoadedImageDecoderTest.java
View File

@ -28,8 +28,8 @@ import androidx.media3.common.MimeTypes;
import androidx.media3.decoder.DecoderInputBuffer; import androidx.media3.decoder.DecoderInputBuffer;
import androidx.media3.exoplayer.RendererCapabilities; import androidx.media3.exoplayer.RendererCapabilities;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.common.base.Charsets;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -85,8 +85,8 @@ public class ExternallyLoadedImageDecoderTest {
public void decoding_withMultipleBuffersAndEndOfStream_producesExpectedOutput() throws Exception { public void decoding_withMultipleBuffersAndEndOfStream_producesExpectedOutput() throws Exception {
Uri uri1 = Uri.parse("https://image1_longer_name_than_image2.test"); Uri uri1 = Uri.parse("https://image1_longer_name_than_image2.test");
Uri uri2 = Uri.parse("https://image2.test"); Uri uri2 = Uri.parse("https://image2.test");
byte[] uri1Bytes = uri1.toString().getBytes(Charsets.UTF_8); byte[] uri1Bytes = uri1.toString().getBytes(StandardCharsets.UTF_8);
byte[] uri2Bytes = uri2.toString().getBytes(Charsets.UTF_8); byte[] uri2Bytes = uri2.toString().getBytes(StandardCharsets.UTF_8);
Bitmap bitmap1 = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888); Bitmap bitmap1 = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888);
Bitmap bitmap2 = Bitmap.createBitmap(/* width= */ 7, /* height= */ 7, Bitmap.Config.ARGB_8888); Bitmap bitmap2 = Bitmap.createBitmap(/* width= */ 7, /* height= */ 7, Bitmap.Config.ARGB_8888);
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
@ -131,7 +131,7 @@ public class ExternallyLoadedImageDecoderTest {
@Test @Test
public void dequeueOutputBuffer_withDelayedBitmap_onlyReturnsOutputWhenReady() throws Exception { public void dequeueOutputBuffer_withDelayedBitmap_onlyReturnsOutputWhenReady() throws Exception {
Uri uri = Uri.parse("https://image.test"); Uri uri = Uri.parse("https://image.test");
byte[] uriBytes = uri.toString().getBytes(Charsets.UTF_8); byte[] uriBytes = uri.toString().getBytes(StandardCharsets.UTF_8);
Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888); Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888);
SettableFuture<Bitmap> settableFuture = SettableFuture.create(); SettableFuture<Bitmap> settableFuture = SettableFuture.create();
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
@ -152,7 +152,7 @@ public class ExternallyLoadedImageDecoderTest {
public void dequeueOutputBuffer_withFailedFuture_throwsExceptionWithOriginalCause() public void dequeueOutputBuffer_withFailedFuture_throwsExceptionWithOriginalCause()
throws Exception { throws Exception {
Uri uri = Uri.parse("https://image.test"); Uri uri = Uri.parse("https://image.test");
byte[] uriBytes = uri.toString().getBytes(Charsets.UTF_8); byte[] uriBytes = uri.toString().getBytes(StandardCharsets.UTF_8);
Throwable testThrowable = new Throwable(); Throwable testThrowable = new Throwable();
SettableFuture<Bitmap> settableFuture = SettableFuture.create(); SettableFuture<Bitmap> settableFuture = SettableFuture.create();
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
@ -176,7 +176,7 @@ public class ExternallyLoadedImageDecoderTest {
dequeueOutputBuffer_withCancelledFuture_throwsExceptionWithCancellationExceptionCause() dequeueOutputBuffer_withCancelledFuture_throwsExceptionWithCancellationExceptionCause()
throws Exception { throws Exception {
Uri uri = Uri.parse("https://image.test"); Uri uri = Uri.parse("https://image.test");
byte[] uriBytes = uri.toString().getBytes(Charsets.UTF_8); byte[] uriBytes = uri.toString().getBytes(StandardCharsets.UTF_8);
SettableFuture<Bitmap> settableFuture = SettableFuture.create(); SettableFuture<Bitmap> settableFuture = SettableFuture.create();
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
new ExternallyLoadedImageDecoder.Factory(request -> settableFuture).createImageDecoder(); new ExternallyLoadedImageDecoder.Factory(request -> settableFuture).createImageDecoder();
@ -197,7 +197,7 @@ public class ExternallyLoadedImageDecoderTest {
@Test @Test
public void flush_beforeFirstBuffer_allowsToQueueNextBuffer() throws Exception { public void flush_beforeFirstBuffer_allowsToQueueNextBuffer() throws Exception {
Uri uri = Uri.parse("https://image.test"); Uri uri = Uri.parse("https://image.test");
byte[] uriBytes = uri.toString().getBytes(Charsets.UTF_8); byte[] uriBytes = uri.toString().getBytes(StandardCharsets.UTF_8);
Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888); Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888);
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
new ExternallyLoadedImageDecoder.Factory(request -> immediateFuture(bitmap)) new ExternallyLoadedImageDecoder.Factory(request -> immediateFuture(bitmap))
@ -222,8 +222,8 @@ public class ExternallyLoadedImageDecoderTest {
throws Exception { throws Exception {
Uri uri1 = Uri.parse("https://image1.test"); Uri uri1 = Uri.parse("https://image1.test");
Uri uri2 = Uri.parse("https://image2.test"); Uri uri2 = Uri.parse("https://image2.test");
byte[] uri1Bytes = uri1.toString().getBytes(Charsets.UTF_8); byte[] uri1Bytes = uri1.toString().getBytes(StandardCharsets.UTF_8);
byte[] uri2Bytes = uri2.toString().getBytes(Charsets.UTF_8); byte[] uri2Bytes = uri2.toString().getBytes(StandardCharsets.UTF_8);
Bitmap bitmap2 = Bitmap.createBitmap(/* width= */ 7, /* height= */ 7, Bitmap.Config.ARGB_8888); Bitmap bitmap2 = Bitmap.createBitmap(/* width= */ 7, /* height= */ 7, Bitmap.Config.ARGB_8888);
SettableFuture<Bitmap> settableFuture = SettableFuture.create(); SettableFuture<Bitmap> settableFuture = SettableFuture.create();
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
@ -256,8 +256,8 @@ public class ExternallyLoadedImageDecoderTest {
public void flush_afterDecoding_allowsToQueueNextBuffer() throws Exception { public void flush_afterDecoding_allowsToQueueNextBuffer() throws Exception {
Uri uri1 = Uri.parse("https://image1.test"); Uri uri1 = Uri.parse("https://image1.test");
Uri uri2 = Uri.parse("https://image2.test"); Uri uri2 = Uri.parse("https://image2.test");
byte[] uri1Bytes = uri1.toString().getBytes(Charsets.UTF_8); byte[] uri1Bytes = uri1.toString().getBytes(StandardCharsets.UTF_8);
byte[] uri2Bytes = uri2.toString().getBytes(Charsets.UTF_8); byte[] uri2Bytes = uri2.toString().getBytes(StandardCharsets.UTF_8);
Bitmap bitmap1 = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888); Bitmap bitmap1 = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888);
Bitmap bitmap2 = Bitmap.createBitmap(/* width= */ 7, /* height= */ 7, Bitmap.Config.ARGB_8888); Bitmap bitmap2 = Bitmap.createBitmap(/* width= */ 7, /* height= */ 7, Bitmap.Config.ARGB_8888);
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
@ -290,7 +290,7 @@ public class ExternallyLoadedImageDecoderTest {
@Test @Test
public void flush_duringEndOfStreamSample_allowsToQueueNextBuffer() throws Exception { public void flush_duringEndOfStreamSample_allowsToQueueNextBuffer() throws Exception {
Uri uri = Uri.parse("https://image1.test"); Uri uri = Uri.parse("https://image1.test");
byte[] uriBytes = uri.toString().getBytes(Charsets.UTF_8); byte[] uriBytes = uri.toString().getBytes(StandardCharsets.UTF_8);
Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888); Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888);
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
new ExternallyLoadedImageDecoder.Factory(request -> immediateFuture(bitmap)) new ExternallyLoadedImageDecoder.Factory(request -> immediateFuture(bitmap))
@ -316,7 +316,7 @@ public class ExternallyLoadedImageDecoderTest {
@Test @Test
public void flush_afterEndOfStreamSample_allowsToQueueNextBuffer() throws Exception { public void flush_afterEndOfStreamSample_allowsToQueueNextBuffer() throws Exception {
Uri uri = Uri.parse("https://image1.test"); Uri uri = Uri.parse("https://image1.test");
byte[] uriBytes = uri.toString().getBytes(Charsets.UTF_8); byte[] uriBytes = uri.toString().getBytes(StandardCharsets.UTF_8);
Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888); Bitmap bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 5, Bitmap.Config.ARGB_8888);
ExternallyLoadedImageDecoder decoder = ExternallyLoadedImageDecoder decoder =
new ExternallyLoadedImageDecoder.Factory(request -> immediateFuture(bitmap)) new ExternallyLoadedImageDecoder.Factory(request -> immediateFuture(bitmap))