Fix previousNumDeltaPocs in skipShortTermRefPicSets

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java

@@ -439,7 +439,10 @@ public final class H265Reader implements ElementaryStreamReader {
         numPositivePics = 0;
         numPositivePics = 0;
         for (int j = 0; j <= previousNumDeltaPocs; j++) {
         for (int j = 0; j <= previousNumDeltaPocs; j++) {
           if (!bitArray.readBit()) { // used_by_curr_pic_flag[j]
           if (!bitArray.readBit()) { // used_by_curr_pic_flag[j]
-            if (bitArray.readBit()) { // use_delta_flag[j]
+            if (!bitArray.readBit()) { // use_delta_flag[j]
+              continue; // if not use_delta_flag, skip increase numDeltaPocs
+            }
+          }
           if (deltaRpsSign) {
           if (deltaRpsSign) {
             // See H.265/HEVC (2014) section 7.4.8 equation 7-61
             // See H.265/HEVC (2014) section 7.4.8 equation 7-61
             numNegativePics++;
             numNegativePics++;
@@ -448,8 +451,6 @@ public final class H265Reader implements ElementaryStreamReader {
             numPositivePics++;
             numPositivePics++;
           }
           }
         }
         }
-          }
-        }
 
 
       } else {
       } else {
         numNegativePics = bitArray.readUnsignedExpGolombCodedInt();
         numNegativePics = bitArray.readUnsignedExpGolombCodedInt();

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.0.dump

@@ -15,6 +15,7 @@ track 256:
     codecs = hvc1.1.6.L63.90
     codecs = hvc1.1.6.L63.90
     width = 914
     width = 914
     height = 686
     height = 686
+    pixelWidthHeightRatio = 1.0003651
     initializationData:
     initializationData:
       data = length 146, hash 61554FEF
       data = length 146, hash 61554FEF
   sample 0:
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.1.dump

@@ -15,6 +15,7 @@ track 256:
     codecs = hvc1.1.6.L63.90
     codecs = hvc1.1.6.L63.90
     width = 914
     width = 914
     height = 686
     height = 686
+    pixelWidthHeightRatio = 1.0003651
     initializationData:
     initializationData:
       data = length 146, hash 61554FEF
       data = length 146, hash 61554FEF
   sample 0:
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump

@@ -15,6 +15,7 @@ track 256:
     codecs = hvc1.1.6.L63.90
     codecs = hvc1.1.6.L63.90
     width = 914
     width = 914
     height = 686
     height = 686
+    pixelWidthHeightRatio = 1.0003651
     initializationData:
     initializationData:
       data = length 146, hash 61554FEF
       data = length 146, hash 61554FEF
   sample 0:
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump

@@ -15,6 +15,7 @@ track 256:
     codecs = hvc1.1.6.L63.90
     codecs = hvc1.1.6.L63.90
     width = 914
     width = 914
     height = 686
     height = 686
+    pixelWidthHeightRatio = 1.0003651
     initializationData:
     initializationData:
       data = length 146, hash 61554FEF
       data = length 146, hash 61554FEF
   sample 0:
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.unknown_length.dump

@@ -12,6 +12,7 @@ track 256:
     codecs = hvc1.1.6.L63.90
     codecs = hvc1.1.6.L63.90
     width = 914
     width = 914
     height = 686
     height = 686
+    pixelWidthHeightRatio = 1.0003651
     initializationData:
     initializationData:
       data = length 146, hash 61554FEF
       data = length 146, hash 61554FEF
   sample 0:
   sample 0: