Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp" into nyc-dev

Browse Source 
am: 03abaa5

* commit '03abaa5df97d914c968c2837712fa5e6f04cf189':
  Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp

Change-Id: I3beec445a31e3fa9cdebabd4b34154858b2fe36e
This commit is contained in:
Andy Hung
2016-04-13 00:36:41 +00:00
committed by android-build-merger
parent d516393865 03abaa5df9
commit ffc23a68f2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/java/android/media/AudioRecord.java
View File

@@ -876,22 +876,24 @@ public class AudioRecord implements AudioRouting
* Calling {@link #startRecording()} following a {@link #stop()} will reset * Calling {@link #startRecording()} following a {@link #stop()} will reset
* the frame count to 0. * the frame count to 0.
* *
* @param timestamp a reference to a non-null AudioTimestamp instance. * @param outTimestamp a caller provided non-null AudioTimestamp instance,
* which is updated with the AudioRecord frame delivery information upon success.
* @param timebase one of * @param timebase one of
* {@link AudioTimestamp#TIMEBASE_BOOTTIME AudioTimestamp.TIMEBASE_BOOTTIME} or * {@link AudioTimestamp#TIMEBASE_BOOTTIME AudioTimestamp.TIMEBASE_BOOTTIME} or
* {@link AudioTimestamp#TIMEBASE_MONOTONIC AudioTimestamp.TIMEBASE_MONOTONIC}. * {@link AudioTimestamp#TIMEBASE_MONOTONIC AudioTimestamp.TIMEBASE_MONOTONIC},
* used to select the clock for the AudioTimestamp time.
* @return {@link #SUCCESS} if a timestamp is available, * @return {@link #SUCCESS} if a timestamp is available,
* or {@link #ERROR_INVALID_OPERATION} if a timestamp not available. * or {@link #ERROR_INVALID_OPERATION} if a timestamp not available.
*/ */
public int getTimestamp(@NonNull AudioTimestamp timestamp, public int getTimestamp(@NonNull AudioTimestamp outTimestamp,
@AudioTimestamp.Timebase int timebase) @AudioTimestamp.Timebase int timebase)
{ {
if (timestamp == null || if (outTimestamp == null ||
(timebase != AudioTimestamp.TIMEBASE_BOOTTIME (timebase != AudioTimestamp.TIMEBASE_BOOTTIME
&& timebase != AudioTimestamp.TIMEBASE_MONOTONIC)) { && timebase != AudioTimestamp.TIMEBASE_MONOTONIC)) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
return native_get_timestamp(timestamp, timebase); return native_get_timestamp(outTimestamp, timebase);
} }
/** /**
@@ -1725,7 +1727,7 @@ public class AudioRecord implements AudioRouting
private native final void native_enableDeviceCallback(); private native final void native_enableDeviceCallback();
private native final void native_disableDeviceCallback(); private native final void native_disableDeviceCallback();
private native final int native_get_timestamp(@NonNull AudioTimestamp timestamp, private native final int native_get_timestamp(@NonNull AudioTimestamp outTimestamp,
@AudioTimestamp.Timebase int timebase); @AudioTimestamp.Timebase int timebase);
//--------------------------------------------------------- //---------------------------------------------------------