FFmpeg: Create, use av_err2string() #689
Merged
Conversation
This file contains 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
- Previously 'av_make_error_string' was defined in FFmpegUtilities.h for the sole purpose of redefining `av_err2str()` as a call to that function. `av_err2str()` was then used in our code, often in string contexts where its output was cast to `std::string`. - Since that was excessively circular, instead the function is named `av_err2string()`, and it's used directly in contexts where a std::string is expected. - `av_err2str()` is still #defined as `av_err2string(...).c_str()`
Codecov Report
@@ Coverage Diff @@
## develop #689 +/- ##
===========================================
- Coverage 50.40% 50.39% -0.01%
===========================================
Files 155 155
Lines 13291 13292 +1
===========================================
Hits 6699 6699
- Misses 6592 6593 +1
Continue to review full report at Codecov.
|
|
Merge conflicts have been detected on this PR, please resolve. |
ferdnyc
added
ffmpeg
|
Merge conflicts have been detected on this PR, please resolve. |
|
I have no idea why I haven't merged this yet, so... doing so. |
ferdnyc
added a commit
to ferdnyc/libopenshot
that referenced
this pull request
Sep 27, 2021
- Previously 'av_make_error_string' was defined in FFmpegUtilities.h for the sole purpose of redefining `av_err2str()` as a call to that function. `av_err2str()` was then used in our code, often in string contexts where its output was cast to `std::string`. - Since that was excessively circular, instead the function is named `av_err2string()`, and it's used directly in contexts where a std::string is expected. - `av_err2str()` is still #defined as `av_err2string(...).c_str()`
ferdnyc
added a commit
to ferdnyc/libopenshot
that referenced
this pull request
Sep 27, 2021
- Previously 'av_make_error_string' was defined in FFmpegUtilities.h for the sole purpose of redefining `av_err2str()` as a call to that function. `av_err2str()` was then used in our code, often in string contexts where its output was cast to `std::string`. - Since that was excessively circular, instead the function is named `av_err2string()`, and it's used directly in contexts where a std::string is expected. - `av_err2str()` is still #defined as `av_err2string(...).c_str()`
ferdnyc
added a commit
to ferdnyc/libopenshot
that referenced
this pull request
Oct 27, 2021
- Previously 'av_make_error_string' was defined in FFmpegUtilities.h for the sole purpose of redefining `av_err2str()` as a call to that function. `av_err2str()` was then used in our code, often in string contexts where its output was cast to `std::string`. - Since that was excessively circular, instead the function is named `av_err2string()`, and it's used directly in contexts where a std::string is expected. - `av_err2str()` is still #defined as `av_err2string(...).c_str()`
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.
(Note: Split out of #661)
My commit message for this reads:
for the sole purpose of redefining
av_err2str()as a call to thatfunction.
av_err2str()was then used in our code, often in stringcontexts where its output was cast to
std::string.av_err2string(), and it's used directly in contexts where astd::string is expected.
av_err2str()is still #defined asav_err2string(...).c_str()What actually happened was worse than I made it sound:
av_make_error_string()wrapped FFmpeg'sav_strerror()to return astd::string, for C++ compatibilityav_err2str()was then redefined:char*version ofav_make_error_string()MostAll uses ofav_err2str(errnum)in the code were then written asLike I said, dizzyingly circular. So all of those
(std::string)av_err2str(errnum)s are now replaced withav_err2string(errnum). No casting needed.