sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rewriting upstream/crypto package in lib-datasource

Browse source 
PiperOrigin-RevId: 406840246
This commit is contained in:
bachinger 2021-11-01 16:07:05 +00:00 committed by tonihei
parent 0d01cae270
commit 70713c8458
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/datasource/src/main/java/com/google/android/exoplayer2/upstream/AesCipherDataSink.java → library/datasource/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
View file

@ -13,12 +13,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.upstream; package com.google.android.exoplayer2.upstream.crypto;
import static com.google.android.exoplayer2.util.Util.castNonNull; import static com.google.android.exoplayer2.util.Util.castNonNull;
import static java.lang.Math.min; import static java.lang.Math.min;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.upstream.DataSink;
import com.google.android.exoplayer2.upstream.DataSpec;
import java.io.IOException; import java.io.IOException;
import javax.crypto.Cipher; import javax.crypto.Cipher;

5
library/datasource/src/main/java/com/google/android/exoplayer2/upstream/AesCipherDataSource.java → library/datasource/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.upstream; package com.google.android.exoplayer2.upstream.crypto;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Util.castNonNull; import static com.google.android.exoplayer2.util.Util.castNonNull;
@ -21,6 +21,9 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.TransferListener;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
library/datasource/src/main/java/com/google/android/exoplayer2/upstream/AesFlushingCipher.java → library/datasource/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.upstream; package com.google.android.exoplayer2.upstream.crypto;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;

0
library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java → library/datasource/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java
View file

2
library/datasource/src/test/java/com/google/android/exoplayer2/upstream/AesFlushingCipherTest.java → library/datasource/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.upstream; package com.google.android.exoplayer2.upstream.crypto;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static java.lang.Math.min; import static java.lang.Math.min;