On 03/07/2013 01:58 PM, Anton Khirnov wrote:
> This should ensure that a valid channel layout is always set on a frame,
> until a better solution is implemented.
> ---
> libavcodec/utils.c | 24 ++++++++++++++++++++++--
> 1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index 9cf826c..1bdca17 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -558,8 +558,28 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame,
> int flags)
> frame->sample_rate = avctx->sample_rate;
> if (frame->format < 0)
> frame->format = avctx->sample_fmt;
> - if (!frame->channel_layout)
> - frame->channel_layout = avctx->channel_layout;
> + if (!frame->channel_layout) {
> + if (avctx->channel_layout) {
> + if
> (av_get_channel_layout_nb_channels(avctx->channel_layout) !=
> + avctx->channels) {
> + av_log(avctx, AV_LOG_ERROR, "Inconsistent channel "
> + "configuration.\n");
> + return AVERROR(EINVAL);
> + }
> +
> + frame->channel_layout = avctx->channel_layout;
> + } else {
> + if (avctx->channels > FF_SANE_NB_CHANNELS) {
> + av_log(avctx, AV_LOG_ERROR, "Too many channels: %d.\n",
> + avctx->channels);
> + return AVERROR(ENOSYS);
> + }
> +
> + frame->channel_layout =
> av_get_default_channel_layout(avctx->channels);
> + if (!frame->channel_layout)
> + frame->channel_layout = (1ULL << avctx->channels) - 1;
> + }
> + }
> break;
> default: return AVERROR(EINVAL);
> }
LGTM
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
