Formatting fixes and release notes

androidx · Dec 11, 2023 · 6603f5d · 6603f5d
1 parent 6f5187a
commit 6603f5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -50,6 +50,8 @@
  `ColorInfo.colorSpace`, `ColorInfo.colorTransfer`, and
  `ColorInfo.colorRange` values
  ([#692](https://github.com/androidx/media/pull/692)).
+ * Fix wrong keyframe detection for TS H264 streams
+ ([#864](https://github.com/androidx/media/pull/864)).
 * Audio:
 * Video:
  * Add workaround for a device issue on Galaxy Tab S7 FE, Chromecast with

diff --git a/libraries/decoder_ffmpeg/src/main/jni/ffmpeg b/libraries/decoder_ffmpeg/src/main/jni/ffmpeg
@@ -0,0 +1 @@
+/usr/local/google/home/tonihei/ffmpeg/ffmpeg
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java
@@ -330,11 +330,12 @@ public void reset() {
  sliceHeader.clear();
  }
 
- public void startNalUnit(long position, int type, long pesTimeUs, boolean rai) {
+ public void startNalUnit(
+ long position, int type, long pesTimeUs, boolean randomAccessIndicator) {
  nalUnitType = type;
  nalUnitTimeUs = pesTimeUs;
  nalUnitStartPosition = position;
- randomAccessIndicator = rai;
+ this.randomAccessIndicator = randomAccessIndicator;
  if ((allowNonIdrKeyframes && nalUnitType == NalUnitUtil.NAL_UNIT_TYPE_NON_IDR)
  || (detectAccessUnits
  && (nalUnitType == NalUnitUtil.NAL_UNIT_TYPE_IDR