Trimming: add the rotation matrix into TrackHeaderBoxandroid-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22.2tools_r22jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-dev

bug:7093055

Change-Id: Idcb04c71f515ab7d7d4757b2136ac81a9b06b6a0

3 files changed, 11 insertions, 0 deletions

diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java
index 3bff1a5..7e4dbe1 100644
--- a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java
+++ b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java
@@ -167,6 +167,7 @@ public class Mp4TrackImpl extends AbstractTrack {
         trackMetaData.setHeight(tkhd.getHeight());
         trackMetaData.setWidth(tkhd.getWidth());
         trackMetaData.setLayer(tkhd.getLayer());
+        trackMetaData.setMatrix(tkhd.getMatrix());
     }
 
     public List<ByteBuffer> getSamples() {
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/TrackMetaData.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/TrackMetaData.java
index c262309..4454ba5 100644
--- a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/TrackMetaData.java
+++ b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/TrackMetaData.java
@@ -30,6 +30,7 @@ public class TrackMetaData implements Cloneable {
     private float volume;
     private long trackId = 1; // zero is not allowed
     private int group = 0;
+    private long[] matrix = new long[]{0x00010000, 0, 0, 0, 0x00010000, 0, 0, 0, 0x40000000};
 
 
     /**
@@ -79,6 +80,14 @@ public class TrackMetaData implements Cloneable {
         this.width = width;
     }
 
+    public long[] getMatrix() {
+        return matrix;
+    }
+
+    public void setMatrix(long[] m) {
+        this.matrix = m;
+    }
+
     public double getHeight() {
         return height;
     }
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java
index 9bd1ca6..7c20a39 100644
--- a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java
+++ b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java
@@ -226,6 +226,7 @@ public class DefaultMp4Builder implements Mp4Builder {
         tkhd.setModificationTime(DateHelper.convert(new Date()));
         tkhd.setTrackId(track.getTrackMetaData().getTrackId());
         tkhd.setVolume(track.getTrackMetaData().getVolume());
+        tkhd.setMatrix(track.getTrackMetaData().getMatrix());
         if (tkhd.getCreationTime() >= 1l << 32 ||
                 tkhd.getModificationTime() >= 1l << 32 ||
                 tkhd.getDuration() >= 1l << 32) {