Move sample rate and sample format conversion utils into FFMPEGCommon.cpp
#629
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
facebook-github-bot
added
the
CLA Signed
scotts
reviewed
Apr 11, 2025
| return swrContext; | ||
| } | ||
|
|
||
| UniqueAVFrame convertAudioAVFrameSampleFormatAndSampleRate( | ||
| const UniqueSwrContext& swrContext, | ||
| const UniqueAVFrame& srcAVFrame, |
There was a problem hiding this comment.
Nit: we should be consistent about src and source. I have a preference for src, as it's a universal abbreviation, particularly when paired with dst. But if we say source in a lot of other places, we should stick with that.
There was a problem hiding this comment.
Double nit, and I recognize this name already existed: convertAudioAVFrameSampleFormatAndSampleRate() is very long, and I feel like we're encoding parameter names that modify the operation into the name. I feel like it's clearer as just convertAudioAVFrame().
There was a problem hiding this comment.
Sounds good, I'll merge as-is and follow-up with a PR to address these
scotts
approved these changes
Apr 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR moves the sample rate and sample format conversions utils from SingleStreamDecoder into FFMPEGCommon. Sample format conversion is needed for encoding too, so we need to make them common.
Specifically:
SingleStreamDecoder::createSwrContextis removed and its logic is not part of FFMPEGCommon'sallocateSwrContext, which was renamed intocreateSwrContextSingleStreamDecoder::convertAudioAVFrameSampleFormatAndSampleRateis moved tooInputs are slightly modified to account for the fact that there's no
streamInfo_anymore. Other than that, this is just copy/pasting code.