Skip to content
Snippets Groups Projects

avcodec: update audio encoder to use ch_layout for channel ordering

Merged Ilkka Ollakka requested to merge ileoo/vlc:master into master

It was introduced in 2022-03-15 - lavc 59.24.100 /lavu 57.24.100 , and channel_layout was deprecated and will be removed at some point.

One alternative with new API set would be just to set custom order, so we wouldn't need to reorder channels in vlc end, but I decided to go with smaller changes.

I tested this with 7.1 channel mp4 file for channel testing, checked with audacity on audio, encoded with ffmpeg and vlc and checked audio output with audacity to compare. Also tested that from 7.1 to stereo worked.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Steve Lhomme
  • Steve Lhomme changed milestone to %4.0

    changed milestone to %4.0

  • Ilkka Ollakka added 5 commits

    added 5 commits

    Compare with previous version

  • Steve Lhomme
  • Steve Lhomme
  • Ilkka Ollakka added 4 commits

    added 4 commits

    • c7cceca6 - 1 commit from branch videolan:master
    • 68860b84 - avcodec: use p_enc audio channels instead of context channels
    • 60d4a7df - avcodec: add handling of new ch_layout
    • 6bc1381d - avcodec: use ch_layout for channel layout

    Compare with previous version

  • Ilkka Ollakka added 3 commits

    added 3 commits

    • d860eda7 - avcodec: use p_enc audio channels instead of context channels in encoder
    • 06b52f62 - avcodec: add handling of new ch_layout in audio encoder
    • ded4dab1 - avcodec: use ch_layout for channel layout in audio encoder

    Compare with previous version

  • Steve Lhomme approved this merge request

    approved this merge request

  • Steve Lhomme resolved all threads

    resolved all threads

  • Ilkka Ollakka resolved all threads

    resolved all threads

  • Ilkka Ollakka mentioned in merge request !3872 (merged)

    mentioned in merge request !3872 (merged)

  • Jean-Baptiste Kempf approved this merge request

    approved this merge request

  • MR Acceptance result

    :tada: This MergeRequest has been Accepted! Congratulations.

    MR acceptance checks details:

    • :white_check_mark: MR should be considered mergeable by Gitlab
    • :white_check_mark: Last pipeline should be successful
    • :white_check_mark: MergeRequest should have at least one external review and/or vote
    • :white_check_mark: All threads should be resolved, and score >= 0
    • :white_check_mark: MergeRequest should have no activity (threads/votes) for (24h/24h)

    This message was automatically generated by homer-bot.

  • Ilkka Ollakka added 38 commits

    added 38 commits

    • ded4dab1...8b96a63e - 35 commits from branch videolan:master
    • 4681be5c - avcodec: use p_enc audio channels instead of context channels in encoder
    • 062e1b55 - avcodec: add handling of new ch_layout in audio encoder
    • f6de0693 - avcodec: use ch_layout for channel layout in audio encoder

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading