Message ID | 73537ed2-5482-0303-0a1f-1c21d4ff24a2@gmail.com |
---|---|
State | New |
Headers | show |
2017-11-09 9:01 GMT+01:00 pkv.stream <pkv.stream@gmail.com>: > 1) there are changes to make to the list of channel layouts not requiring > PCE > > ==> AV_CH_LAYOUT_5POINT0 to AV_CH_LAYOUT_5POINT0_BACK since the previous is > 5.0(side) while the latter is 5.0 which is what is in spec (table 1.19 > ISO/IEC 14496-3:200X(E) or table 42 ISO/IEC 13818-7:2004(E) ) > > see patch in attachment (can't be applied directly due to rebasing issues > from your initial patch) Did you test what effect this patch has on ffmpeg (the command line interface) when encoding five- or six-channel aac from back and side source? If something weird happens (like resampling), a Changelog entry may be a good idea. Thank you, Carl Eugen
Le 14/11/2017 à 1:20 AM, Carl Eugen Hoyos a écrit : > 2017-11-09 9:01 GMT+01:00 pkv.stream <pkv.stream@gmail.com>: > >> 1) there are changes to make to the list of channel layouts not requiring >> PCE >> >> ==> AV_CH_LAYOUT_5POINT0 to AV_CH_LAYOUT_5POINT0_BACK since the previous is >> 5.0(side) while the latter is 5.0 which is what is in spec (table 1.19 >> ISO/IEC 14496-3:200X(E) or table 42 ISO/IEC 13818-7:2004(E) ) >> >> see patch in attachment (can't be applied directly due to rebasing issues >> from your initial patch) > Did you test what effect this patch has on ffmpeg (the command line interface) > when encoding five- or six-channel aac from back and side source? yes I did check, this patch reverts aac encoder to previous behaviour with 5.0 and 5.1 (when there was no PCE) > If something weird happens (like resampling), a Changelog entry may be a > good idea. > > Thank you, Carl Eugen > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
2017-11-14 21:01 GMT+01:00 pkv.stream <pkv.stream@gmail.com>: > Le 14/11/2017 à 1:20 AM, Carl Eugen Hoyos a écrit : >> >> 2017-11-09 9:01 GMT+01:00 pkv.stream <pkv.stream@gmail.com>: >> >>> 1) there are changes to make to the list of channel layouts not requiring >>> PCE >>> >>> ==> AV_CH_LAYOUT_5POINT0 to AV_CH_LAYOUT_5POINT0_BACK >>> since the previous is >>> 5.0(side) while the latter is 5.0 which is what is in spec (table 1.19 >>> ISO/IEC 14496-3:200X(E) or table 42 ISO/IEC 13818-7:2004(E) ) >>> >>> see patch in attachment (can't be applied directly due to rebasing issues >>> from your initial patch) >> >> Did you test what effect this patch has on ffmpeg (the command line >> interface) >> when encoding five- or six-channel aac from back and side source? > > yes I did check, this patch reverts aac encoder to previous behaviour with > 5.0 and 5.1 (when there was no PCE) Thank you for the explanation! Carl Eugen
Le 14/11/2017 à 11:14 PM, Carl Eugen Hoyos a écrit : > 2017-11-14 21:01 GMT+01:00 pkv.stream <pkv.stream@gmail.com>: >> Le 14/11/2017 à 1:20 AM, Carl Eugen Hoyos a écrit : >>> 2017-11-09 9:01 GMT+01:00 pkv.stream <pkv.stream@gmail.com>: >>> >>>> 1) there are changes to make to the list of channel layouts not requiring >>>> PCE >>>> >>>> ==> AV_CH_LAYOUT_5POINT0 to AV_CH_LAYOUT_5POINT0_BACK >>>> since the previous is >>>> 5.0(side) while the latter is 5.0 which is what is in spec (table 1.19 >>>> ISO/IEC 14496-3:200X(E) or table 42 ISO/IEC 13818-7:2004(E) ) >>>> >>>> see patch in attachment (can't be applied directly due to rebasing issues >>>> from your initial patch) >>> Did you test what effect this patch has on ffmpeg (the command line >>> interface) >>> when encoding five- or six-channel aac from back and side source? >> yes I did check, this patch reverts aac encoder to previous behaviour with >> 5.0 and 5.1 (when there was no PCE) more accurately: 5.0 5.1 back is reverted to previous behaviour , but 5.0 5.1 side is not because it uses now PCE, which agrees with spec (no weird channel rematrixing though); sorry for the inaccuracy. > Thank you for the explanation! > > Carl Eugen > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index c852a29..ab1023c 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aacenctab.h @@ -45,13 +45,13 @@ extern const int ff_aac_swb_size_128_len; /* Supported layouts without using a PCE */ static const int64_t aac_normal_chan_layouts[7] = { - AV_CH_LAYOUT_MONO, - AV_CH_LAYOUT_STEREO, - AV_CH_LAYOUT_SURROUND, - AV_CH_LAYOUT_4POINT0, - AV_CH_LAYOUT_5POINT0, - AV_CH_LAYOUT_5POINT1, - AV_CH_LAYOUT_7POINT1, + AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_SURROUND, + AV_CH_LAYOUT_4POINT0, + AV_CH_LAYOUT_5POINT0_BACK, // -channel_layout 5.0 + AV_CH_LAYOUT_5POINT1_BACK, // -channel_layout 5.1 + AV_CH_LAYOUT_7POINT1, // should be AV_CH_LAYOUT_7POINT1_WIDE_BACK acording to spec but unpractical }; /** default channel configurations */