Fix wrongly reverted test changes

PiperOrigin-RevId: 758123497

Author: ychaparov

libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java

@@ -555,8 +555,12 @@ public void videoEditing_withOneFrameInEncoder_completesWithConsistentFrameCount
             .build()
             .run(testId, editedMediaItem);
 
+    // Rarely, MediaCodec decoders output frames in the wrong order.
+    // When the MediaCodec encoder sees frames in the wrong order, fewer output frames are produced.
+    // Use a tolerance when comparing frame counts. See b/343476417#comment5.
     assertThat(result.exportResult.videoFrameCount)
-        .isEqualTo(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S.videoFrameCount);
+        .isWithin(2)
+        .of(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S.videoFrameCount);
     assertThat(new File(result.filePath).length()).isGreaterThan(0);
   }
 
@@ -582,8 +586,12 @@ public void videoEditing_withMaxFramesInEncoder_completesWithConsistentFrameCoun
             .build()
             .run(testId, editedMediaItem);
 
+    // Rarely, MediaCodec decoders output frames in the wrong order.
+    // When the MediaCodec encoder sees frames in the wrong order, fewer output frames are produced.
+    // Use a tolerance when comparing frame counts. See b/343476417#comment5.
     assertThat(result.exportResult.videoFrameCount)
-        .isEqualTo(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S.videoFrameCount);
+        .isWithin(2)
+        .of(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S.videoFrameCount);
     assertThat(new File(result.filePath).length()).isGreaterThan(0);
   }