solve conflicts

huggingface · May 23, 2024 · 3a35145 · 3a35145
1 parent e2bdde1
commit 3a35145
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/transformers/pipelines/automatic_speech_recognition.py b/src/transformers/pipelines/automatic_speech_recognition.py
@@ -498,6 +498,8 @@ def _forward(self, model_inputs, return_timestamps=False, **generate_kwargs):
                             generate_kwargs["num_frames"] = stride[0] // self.feature_extractor.hop_length
                         else:
                             generate_kwargs["num_frames"] = [s[0] // self.feature_extractor.hop_length for s in stride]
+                    else:
+                        generate_kwargs["num_frames"] = num_frames
 
             tokens = self.model.generate(
                 inputs=inputs,