Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99f0c3f3 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Rename RecordEvent getFirstMbInSlice into getFirstMacroblockInSlice"

parents dd0fdcce e7eee730

api/system-current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -5416,7 +5416,7 @@ package android.media.tv.tuner.filter { 
















  public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {







  public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {











    method public long getDataLength();







    method public long getDataLength();











    method public int getFirstMbInSlice();







    method public int getFirstMacroblockInSlice();











    method public int getMpuSequenceNumber();







    method public int getMpuSequenceNumber();











    method public long getPts();







    method public long getPts();











    method public int getScHevcIndexMask();







    method public int getScHevcIndexMask();










@@ -5592,7 +5592,7 @@ package android.media.tv.tuner.filter {

























  public class TsRecordEvent extends android.media.tv.tuner.filter.FilterEvent {







  public class TsRecordEvent extends android.media.tv.tuner.filter.FilterEvent {











    method public long getDataLength();







    method public long getDataLength();











    method public int getFirstMbInSlice();







    method public int getFirstMacroblockInSlice();











    method public int getPacketId();







    method public int getPacketId();











    method public long getPts();







    method public long getPts();











    method public int getScIndexMask();







    method public int getScIndexMask();

































core/api/system-current.txt



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -5356,7 +5356,7 @@ package android.media.tv.tuner.filter {

























  public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {







  public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {











    method public long getDataLength();







    method public long getDataLength();











    method public int getFirstMbInSlice();







    method public int getFirstMacroblockInSlice();











    method public int getMpuSequenceNumber();







    method public int getMpuSequenceNumber();











    method public long getPts();







    method public long getPts();











    method public int getScHevcIndexMask();







    method public int getScHevcIndexMask();










@@ -5532,7 +5532,7 @@ package android.media.tv.tuner.filter {

























  public class TsRecordEvent extends android.media.tv.tuner.filter.FilterEvent {







  public class TsRecordEvent extends android.media.tv.tuner.filter.FilterEvent {











    method public long getDataLength();







    method public long getDataLength();











    method public int getFirstMbInSlice();







    method public int getFirstMacroblockInSlice();











    method public int getPacketId();







    method public int getPacketId();











    method public long getPts();







    method public long getPts();











    method public int getScIndexMask();







    method public int getScIndexMask();

































media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -94,7 +94,7 @@ public class MmtpRecordEvent extends FilterEvent {









     * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version







     * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version











     * information.







     * information.











     */







     */











    public int getFirstMbInSlice() {







    public int getFirstMacroblockInSlice() {











        return mFirstMbInSlice;







        return mFirstMbInSlice;











    }







    }





















































media/java/android/media/tv/tuner/filter/TsRecordEvent.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -99,7 +99,7 @@ public class TsRecordEvent extends FilterEvent {









     * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version







     * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version











     * information.







     * information.











     */







     */











    public int getFirstMbInSlice() {







    public int getFirstMacroblockInSlice() {











        return mFirstMbInSlice;







        return mFirstMbInSlice;











    }







    }











}






}