Make avcodec_pix_fmt_string() use the information in the pixel format

descriptors for printing the number of channels/components.

Also replace the term "nb_channels" with "nb_components" which is more
consistent with the FFmpeg internal terminology, and is somehow
different with respect to the current definition of nb_channels in
PixFmtInfo.

See thread:
Subject: [FFmpeg-devel] [PATCH 6/8] Make avcodec_pix_fmt_string() use the
        information in the pixel format descriptors for printing the
        number of planes. Also replace the term "nb_channels" with
        "nb_planes" which is more correct.
Date: Fri,  5 Nov 2010 12:01:38 +0100

Originally committed as revision 25717 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-11-10 20:13:19 +00:00
parent 086e997e34
commit 2de6f6e828
1 changed files with 4 additions and 5 deletions

View File

@ -438,15 +438,14 @@ void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt)
/* print header */
if (pix_fmt < 0)
snprintf (buf, buf_size,
"name " " nb_channels" " depth"
"name " " nb_components" " depth"
);
else{
PixFmtInfo info= pix_fmt_info[pix_fmt];
const AVPixFmtDescriptor *pixdesc = &av_pix_fmt_descriptors[pix_fmt];
snprintf (buf, buf_size,
"%-11s %5d %9d",
"%-11s %7d %9d",
av_pix_fmt_descriptors[pix_fmt].name,
info.nb_channels,
pixdesc->nb_components,
av_get_bits_per_pixel(&av_pix_fmt_descriptors[pix_fmt])
);
}