ffmpeg 7.0 Update: Use new channel layout #1626
Open
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
hashworks
force-pushed
the
chore/ffmpeg7
branch
5 times, most recently
from
25075c5
to
5eb40d5
Compare
hashworks
changed the title
hashworks
force-pushed
the
chore/ffmpeg7
branch
2 times, most recently
from
42cfe85
to
e135e5b
Compare
hashworks
commented
May 25, 2024
hashworks
force-pushed
the
chore/ffmpeg7
branch
4 times, most recently
from
d04bd4b
to
9b8956a
Compare
hashworks
commented
May 25, 2024
|
This compiles with ffmpeg 7.0 and is currently used in the Arch Linux extra-staging repository: https://gitlab.archlinux.org/archlinux/packaging/packages/ovenmediaengine/-/commit/3a029703f7f9ce35d31487848efd9524516bf220 It is however entirely untested and will remain a draft until then. |
|
I'm marking this as ready - I've been using this for a few weeks now, including transcoding with ffmpeg v7 openh264. The Arch Linux package is now using this patch directly. |
```
[ 17/505| 3%] [static] libapi_server.a: C++ projects/api_server/controllers/v1/vhosts/apps/output_profiles/output_profiles_controller.cpp => intermediates/RELEASE/objs/api_server/controllers/v1/vhosts/apps/output_profiles/output_profiles_controller.o
In file included from projects/providers/multiplex/multiplex_stream.h:11,
from projects/providers/multiplex/multiplex_application.h:16,
from projects/api_server/controllers/v1/vhosts/apps/multiplex_channels/multiplex_channels_controller.cpp:13:
projects/modules/ffmpeg/ffmpeg_conv.h: In static member function ‘static bool ffmpeg::Conv::ToMediaTrack(AVStream*, std::shared_ptr<MediaTrack>)’:
projects/modules/ffmpeg/ffmpeg_conv.h:375:130: error: ‘AVCodecParameters’ {aka ‘struct AVCodecParameters’} has no member named ‘channel_layout’; did you mean ‘ch_layout’?
375 | media_track->GetChannel().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(stream->codecpar->channel_layout));
| ^~~~~~~~~~~~~~
| ch_layout
```
```
/**
* Audio only. The channel layout bitmask. May be 0 if the channel layout is
* unknown or unspecified, otherwise the number of bits set must be equal to
* the channels field.
* @deprecated use ch_layout
*/
attribute_deprecated
uint64_t channel_layout;
```
```
/**
* duration of the corresponding packet, expressed in
* AVStream->time_base units, 0 if unknown.
* - encoding: unused
* - decoding: Read by user.
*
* @deprecated use duration instead
*/
attribute_deprecated
int64_t pkt_duration;
```
…v_get_channel_layout_describe ``` /** * Return a description of a channel layout. * If nb_channels is <= 0, it is guessed from the channel_layout. * * @param buf put here the string containing the channel layout * @param buf_size size in bytes of the buffer * @param nb_channels number of channels * @param channel_layout channel layout bitset * @deprecated use av_channel_layout_describe() */ attribute_deprecated void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout); ```
```
/**
* Audio only. The number of audio channels.
* @deprecated use ch_layout.nb_channels
*/
attribute_deprecated
int channels;
```
Disabling lzo isn't allowed anymore FFmpeg/FFmpeg@df27292 Couldn't find commits for the other two. But I suspect they are now enabled by default.
Otherwise this fails with `Cannot change ownership to uid 66878, gid 100: Invalid argument`, at least with podman.
…n transcoder context
basisbit
approved these changes
Sep 7, 2024
|
ffmpeg 7.1 changed the API again: FFmpeg/FFmpeg@7f17e0e
context->hw_frames_ctx = av_buffer_ref(hw_frames_ref);
av_buffer_unref(&hw_frames_ref);Any ideas? |
13 tasks
|
|
|
First of all, thank you for the PR. I will internally discuss changing FFmpeg to 7.x, and after that, I will modify the code related to hw_frames_ctx of AVFilterList. |
|
Since this blocks the ffmpeg 7.1 release on Arch I've moved the package to our |
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.
Context: At Arch Linux I build OvenMediaEngine against the system libraries. Since we currently rebuild stuff for ffmpeg 7.0 this patch is required.
Please bear with me here, I don't really code in C++.
Note: There was a flag
FF_API_OLD_CHANNEL_LAYOUT, which has been dropped in v7.