Skip to content

Fix Ogg crash when FFmpeg doesn't support Theora

Freya Lupen requested to merge freyalupen/krita:freyalupen/fix-ogg-crash into master

To decide whether to show Ogg in the combobox, Render Animation was checking for the Dirac codec. But when checking for expected encoders, it was checking for libtheora (in KisVideoExportOptionsDialog::encoderIdentifiers()).

If the user's FFmpeg supported Dirac and not Theora, the list of encoders would be empty. This would cause a crash on selecting Ogg (in KisVideoExportOptionsDialog::slotCodecSelected()). To avoid this, check for the codec that's actually going to be used.

  • Is there any reason to not add Dirac to the list of Ogg encoders?
  • It would probably be good to add a check for encoders.isEmpty() somewhere, to catch that before a crash.

Test Plan

  • Use an FFmpeg that supports Dirac and not Theora (I used a self-compiled one). Ogg shouldn't be visible under Render Animation, rather than crashing.
  • Use an FFmpeg that supports Theora (Krita's built-in one), rendering Ogg should work.
  • [Not tested] Use an FFmpeg that supports Theora and not Dirac, rendering Ogg should work.

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Merge request reports