[WIP] FFmpeg 6 #535
Closed
[WIP] FFmpeg 6 #535
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
| int width; | ||
| int height; | ||
| AVRational sample_aspect_ratio; | ||
| AVRational framerate; |
There was a problem hiding this comment.
I don't see this framerate setting being added in the 6.0 interface.
Comment on lines
+214
to
+216
| int64_t start_time_realtime; | ||
| int fps_probe_size; | ||
| int error_recognition; |
There was a problem hiding this comment.
Why add these 3 values to the struct? They are not used anywhere in the code ...
| { | ||
| auto p = reinterpret_cast<AVFrameSideData_59 *>(sideData); | ||
| auto p = reinterpret_cast<AVFrameSideData_57_58 *>(sideData); |
There was a problem hiding this comment.
Nice. Thx for catching this.
Comment on lines
+116
to
+132
| typedef struct AVPacket_60 | ||
| { | ||
| AVBufferRef * buf; | ||
| int64_t pts; | ||
| int64_t dts; | ||
| uint8_t * data; | ||
| int size; | ||
| int stream_index; | ||
| int flags; | ||
| AVPacketSideData *side_data; | ||
| int side_data_elems; | ||
| int64_t duration; | ||
| int64_t pos; | ||
| void * opaque; | ||
| AVBufferRef * opaque_ref; | ||
| AVRational time_base; | ||
| } AVPacket_60; |
There was a problem hiding this comment.
But nothing about the struct changed ...
| // reserved_message | ||
| throw std::logic_error("Not implemented yet"); | ||
| } | ||
| // throw std::logic_error("Not implemented yet"); |
There was a problem hiding this comment.
Why is this change in this class needed? Does not look related to ffmpeg 6 support.
| @@ -261,14 +261,14 @@ playlistItemCompressedVideo::playlistItemCompressedVideo(const QString &compress | |||
| return; | |||
| } | |||
| if (this->rawFormat == video::RawFormat::Invalid || | |||
| (this->rawFormat == video::RawFormat::YUV && !formatYuv.isValid()) || | |||
| /* (this->rawFormat == video::RawFormat::YUV && !formatYuv.isValid()) || */ | |||
| @@ -247,7 +247,7 @@ bool PixelFormatYUV::isValid() const | |||
| if (!planar) | |||
| { | |||
| // Check the packing mode | |||
| if ((this->packingOrder == PackingOrder::YUV || this->packingOrder == PackingOrder::YVU || | |||
| if ((/* this->packingOrder == PackingOrder::YUV || this->packingOrder == PackingOrder::YVU || */ | |||
|
Merged support for ffmpeg 6 in the linked PR. |
|
Vielen Dank. |
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.
Various changes in order to be able run with the latest and greatest FFmpeg.
Please review, comment, criticize.
Thank you so much for the cool tool.
qmake6 -spec linux-clang CONFIG+=debug