diff --git a/libavcodec/internal.h b/libavcodec/internal.h index eb82d79793..e51757f9d6 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -134,7 +134,7 @@ unsigned int avpriv_toupper4(unsigned int x); /** * does needed setup of pkt_pts/pos and such for (re)get_buffer(); */ -void ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); +int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); void avpriv_color_frame(AVFrame *frame, const int color[4]); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a7a15e4dcf..5b53bee3a1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -597,7 +597,7 @@ int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags } } -void ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) +int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) { if (avctx->pkt) { frame->pkt_pts = avctx->pkt->pts; @@ -628,11 +628,32 @@ void ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) 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; + } + } av_frame_set_channels(frame, avctx->channels); break; } + return 0; } #if FF_API_GET_BUFFER @@ -670,7 +691,8 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) return AVERROR(EINVAL); } } - ff_init_buffer_info(avctx, frame); + if ((ret = ff_init_buffer_info(avctx, frame)) < 0) + return ret; #if FF_API_GET_BUFFER /* diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index 2c903d4478..e5679133f9 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -1,27 +1,27 @@ packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=572|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=572|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=572|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2647|flags=K frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2647|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233068|flags=K frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233068|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263073|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263073|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263073|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265151|flags=K frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265151|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495575|flags=K frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495575|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525580|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525580|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525580|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527651|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527651|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527651|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529729|flags=K frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529729|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760153|flags=K frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760153|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790158|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790158|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790158|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=792229|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792229|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792229|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794307|flags=K frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794307|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024731|flags=K diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 94314d798b..8defbc9de1 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -1,27 +1,27 @@ packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,572,K -frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,unknown +frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,mono packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2647,K frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233068,K frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0 packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263073,K -frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,unknown +frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,mono packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265151,K frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495575,K frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0 packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525580,K -frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,unknown +frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,mono packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527651,K -frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,unknown +frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,mono packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529729,K frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760153,K frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0 packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790158,K -frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,unknown +frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,mono packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792229,K -frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,unknown +frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,mono packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794307,K frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024731,K diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 4105293e90..4151b45058 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -27,7 +27,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [/FRAME] [PACKET] codec_type=video @@ -134,7 +134,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [/FRAME] [PACKET] codec_type=video @@ -241,7 +241,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [/FRAME] [PACKET] codec_type=audio @@ -272,7 +272,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [/FRAME] [PACKET] codec_type=video @@ -379,7 +379,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [/FRAME] [PACKET] codec_type=audio @@ -410,7 +410,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [/FRAME] [PACKET] codec_type=video diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index 156f2154be..b473c866f6 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -24,7 +24,7 @@ packets_and_frames.frame.0.pkt_size="2048" packets_and_frames.frame.0.sample_fmt="s16" packets_and_frames.frame.0.nb_samples=1024 packets_and_frames.frame.0.channels=1 -packets_and_frames.frame.0.channel_layout="unknown" +packets_and_frames.frame.0.channel_layout="mono" packets_and_frames.packet.1.codec_type="video" packets_and_frames.packet.1.stream_index=1 packets_and_frames.packet.1.pts=0 @@ -119,7 +119,7 @@ packets_and_frames.frame.3.pkt_size="2048" packets_and_frames.frame.3.sample_fmt="s16" packets_and_frames.frame.3.nb_samples=1024 packets_and_frames.frame.3.channels=1 -packets_and_frames.frame.3.channel_layout="unknown" +packets_and_frames.frame.3.channel_layout="mono" packets_and_frames.packet.4.codec_type="video" packets_and_frames.packet.4.stream_index=1 packets_and_frames.packet.4.pts=2048 @@ -214,7 +214,7 @@ packets_and_frames.frame.6.pkt_size="2048" packets_and_frames.frame.6.sample_fmt="s16" packets_and_frames.frame.6.nb_samples=1024 packets_and_frames.frame.6.channels=1 -packets_and_frames.frame.6.channel_layout="unknown" +packets_and_frames.frame.6.channel_layout="mono" packets_and_frames.packet.7.codec_type="audio" packets_and_frames.packet.7.stream_index=0 packets_and_frames.packet.7.pts=3072 @@ -241,7 +241,7 @@ packets_and_frames.frame.7.pkt_size="2048" packets_and_frames.frame.7.sample_fmt="s16" packets_and_frames.frame.7.nb_samples=1024 packets_and_frames.frame.7.channels=1 -packets_and_frames.frame.7.channel_layout="unknown" +packets_and_frames.frame.7.channel_layout="mono" packets_and_frames.packet.8.codec_type="video" packets_and_frames.packet.8.stream_index=1 packets_and_frames.packet.8.pts=4096 @@ -336,7 +336,7 @@ packets_and_frames.frame.10.pkt_size="2048" packets_and_frames.frame.10.sample_fmt="s16" packets_and_frames.frame.10.nb_samples=1024 packets_and_frames.frame.10.channels=1 -packets_and_frames.frame.10.channel_layout="unknown" +packets_and_frames.frame.10.channel_layout="mono" packets_and_frames.packet.11.codec_type="audio" packets_and_frames.packet.11.stream_index=0 packets_and_frames.packet.11.pts=5120 @@ -363,7 +363,7 @@ packets_and_frames.frame.11.pkt_size="2048" packets_and_frames.frame.11.sample_fmt="s16" packets_and_frames.frame.11.nb_samples=1024 packets_and_frames.frame.11.channels=1 -packets_and_frames.frame.11.channel_layout="unknown" +packets_and_frames.frame.11.channel_layout="mono" packets_and_frames.packet.12.codec_type="video" packets_and_frames.packet.12.stream_index=1 packets_and_frames.packet.12.pts=6144 diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index 0e324b63b6..85349a52a9 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -29,7 +29,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.1] codec_type=video @@ -136,7 +136,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.4] codec_type=video @@ -243,7 +243,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.7] codec_type=audio @@ -274,7 +274,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.8] codec_type=video @@ -381,7 +381,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.11] codec_type=audio @@ -412,7 +412,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.12] codec_type=video diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index 1864debda0..94e63fc0ae 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -28,7 +28,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -132,7 +133,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -236,7 +238,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -266,7 +269,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -370,7 +374,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -400,7 +405,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 8d38202055..ac5ac861aa 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -2,29 +2,29 @@ - + - + - + - + - + - +