Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLAT-25122-ffmpeg-audio-mapping-fix #13134

Merged
merged 1 commit into from
Feb 11, 2025
Merged

PLAT-25122-ffmpeg-audio-mapping-fix #13134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions infra/cdl/kdl/KDLOperatorFfmpeg6_0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,31 @@ public function generateSinglePassCommandLine(KDLFlavor $design, KDLFlavor $targ
$keyVidFilters = $flGrKey+1;
}
}

if(isset($target->_forGenericSource) && $target->_forGenericSource==true) {
$target->multyAudioMapping = null;
$generalAudMapping = 'a';
// Audio mapping handling is needed only if there is an audio stream to generate ...
if(isset($target->_audio)) {
if(isset($target->_forGenericSource) && $target->_forGenericSource==true) {
$target->multyAudioMapping = null;
$generalAudMapping = 'a';
}
else $generalAudMapping = 'a:0';
}
else $generalAudMapping = 'a:0';

$mappingStr = null;
/*
* Following code adapts the FFM4.4 and earlier) cmdLines to FFM6 standard.
* Following code adapts the FFM4.4 (and earlier) cmdLines to FFM6 standard.
* FFM6 'resolves' the ambiguity in previous versions while using both
* the filter_complex and stream mappings.
* Starting with FFM6 the streams that are used by the filter_complex are
* 'mapped' automatically. When in this case explicit '-map' is used as well,
* it is ADDED to the filter_complex 'mapped' streams, resulting converted
* streams duplication. FFM4 and older versions don't duplicate the
* transcodided streams.
* The solution is to use 'named' filter graphs out connections and explicitly
* to map them, and to avoid mapping of the source streams.
* The solution is -
* - using 'named' filter graphs out connections and explicitly mapping them
* - avoiding 'redundant' source stream mapping
*
* Another task is to force the output vid stream as the 1st stream,
* and the aud as the 2nd. It is needed for the multy-entry-edit feature.
* Another task is to force the output vid stream to be the 1st stream,
* and the aud to be the 2nd. It is needed for the multy-entry-edit feature.
*
* !!! IMPORTANT !!!
* This syntax is fully compatibale with the FFM4.4 as well.
Expand All @@ -81,7 +84,8 @@ public function generateSinglePassCommandLine(KDLFlavor $design, KDLFlavor $targ
$mappingStr = '-map \'[vout]\' ';
if(isset($target->multyAudioMapping))
$mappingStr.= implode(' ', $target->multyAudioMapping);
else $mappingStr.= "-map $generalAudMapping";
else if(isset($generalAudMapping))
$mappingStr.= "-map $generalAudMapping";
}
// only aud filters are used ==>
// add aout connection to the audio filter graph.
Expand Down