loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move Mp4LocationData from extractor module to container module

Browse Source 
This class will be shared between extractor and muxer module.

PiperOrigin-RevId: 532784415
This commit is contained in:
sheenachhabra 2023-05-17 15:41:16 +01:00 committed by Ian Baker
parent 84d0206c76
commit 7b62b33127
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/extractor/src/main/java/androidx/media3/extractor/metadata/mp4/Mp4LocationData.java → libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.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 androidx.media3.extractor.metadata.mp4; package androidx.media3.container;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;

2
libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
View File

@ -33,6 +33,7 @@ import androidx.media3.common.util.CodecSpecificDataUtil;
import androidx.media3.common.util.Log; import androidx.media3.common.util.Log;
import androidx.media3.common.util.ParsableByteArray; import androidx.media3.common.util.ParsableByteArray;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import androidx.media3.container.Mp4LocationData;
import androidx.media3.extractor.AacUtil; import androidx.media3.extractor.AacUtil;
import androidx.media3.extractor.Ac3Util; import androidx.media3.extractor.Ac3Util;
import androidx.media3.extractor.Ac4Util; import androidx.media3.extractor.Ac4Util;
@ -42,7 +43,6 @@ import androidx.media3.extractor.ExtractorUtil;
import androidx.media3.extractor.GaplessInfoHolder; import androidx.media3.extractor.GaplessInfoHolder;
import androidx.media3.extractor.HevcConfig; import androidx.media3.extractor.HevcConfig;
import androidx.media3.extractor.OpusUtil; import androidx.media3.extractor.OpusUtil;
import androidx.media3.extractor.metadata.mp4.Mp4LocationData;
import androidx.media3.extractor.metadata.mp4.SmtaMetadataEntry; import androidx.media3.extractor.metadata.mp4.SmtaMetadataEntry;
import androidx.media3.extractor.mp4.Atom.LeafAtom; import androidx.media3.extractor.mp4.Atom.LeafAtom;
import com.google.common.base.Function; import com.google.common.base.Function;

1
libraries/transformer/build.gradle
View File

@ -37,6 +37,7 @@ android {
dependencies { dependencies {
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation project(modulePrefix + 'lib-datasource') implementation project(modulePrefix + 'lib-datasource')
implementation project(modulePrefix + 'lib-container')
implementation project(modulePrefix + 'lib-exoplayer') implementation project(modulePrefix + 'lib-exoplayer')
implementation project(modulePrefix + 'lib-effect') implementation project(modulePrefix + 'lib-effect')
implementation project(modulePrefix + 'lib-muxer') implementation project(modulePrefix + 'lib-muxer')

2
libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java
View File

@ -31,7 +31,7 @@ import androidx.media3.common.Metadata;
import androidx.media3.common.MimeTypes; import androidx.media3.common.MimeTypes;
import androidx.media3.common.util.MediaFormatUtil; import androidx.media3.common.util.MediaFormatUtil;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import androidx.media3.extractor.metadata.mp4.Mp4LocationData; import androidx.media3.container.Mp4LocationData;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;

2
libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java
View File

@ -24,7 +24,7 @@ import androidx.media3.common.Format;
import androidx.media3.common.Metadata; import androidx.media3.common.Metadata;
import androidx.media3.common.MimeTypes; import androidx.media3.common.MimeTypes;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.extractor.metadata.mp4.Mp4LocationData; import androidx.media3.container.Mp4LocationData;
import androidx.media3.muxer.Mp4Muxer; import androidx.media3.muxer.Mp4Muxer;
import androidx.media3.muxer.Mp4Muxer.TrackToken; import androidx.media3.muxer.Mp4Muxer.TrackToken;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;