ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup style and warnings in zm_dump_codecpar

This commit is contained in:
Isaac Connor 2021-06-04 17:32:45 -04:00
parent a78feb739e
commit 9f685d6c2b
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/zm_ffmpeg.cpp
View File

@ -236,11 +236,13 @@ static void zm_log_fps(double d, const char *postfix) {
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0) #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
void zm_dump_codecpar(const AVCodecParameters *par) { void zm_dump_codecpar(const AVCodecParameters *par) {
Debug(1, "Dumping codecpar codec_type(%d %s) codec_id(%d %s) codec_tag(%" PRIu32 ") width(%d) height(%d) bit_rate(%" PRIu64 ")" Debug(1, "Dumping codecpar codec_type %d %s codec_id %d %s codec_tag %" PRIu32
"bpcs %d bprs %d format(%d %s) extradata:%d:%s profile %d level %d field order %d color_range %d color_primaries %d color_trc %d color_space %d location %d video_delay %d", " width %d height %d bit_rate%" PRIu64 " bpcs %d bprs %d format%d %s"
par->codec_type, " extradata:%d:%s profile %d level %d field order %d color_range %d"
" color_primaries %d color_trc %d color_space %d location %d video_delay %d",
static_cast<int>(par->codec_type),
av_get_media_type_string(par->codec_type), av_get_media_type_string(par->codec_type),
par->codec_id, static_cast<int>(par->codec_id),
avcodec_get_name(par->codec_id), avcodec_get_name(par->codec_id),
par->codec_tag, par->codec_tag,
par->width, par->width,
@ -250,8 +252,19 @@ void zm_dump_codecpar(const AVCodecParameters *par) {
par->bits_per_raw_sample, par->bits_per_raw_sample,
par->format, par->format,
(((AVPixelFormat)par->format == AV_PIX_FMT_NONE) ? "none" : av_get_pix_fmt_name((AVPixelFormat)par->format)), (((AVPixelFormat)par->format == AV_PIX_FMT_NONE) ? "none" : av_get_pix_fmt_name((AVPixelFormat)par->format)),
par->extradata_size, ByteArrayToHexString(nonstd::span<const uint8>{par->extradata, par->extradata_size}).c_str(), par->extradata_size, ByteArrayToHexString(nonstd::span<const uint8>{
par->field_order, par->color_range, par->color_primaries, par->color_trc, par->color_space, par->chroma_location, par->video_delay par->extradata,
static_cast<nonstd::span_lite::span<const unsigned char>::size_type>(par->extradata_size)
}).c_str(),
par->profile,
par->level,
static_cast<int>(par->field_order),
static_cast<int>(par->color_range),
static_cast<int>(par->color_primaries),
static_cast<int>(par->color_trc),
static_cast<int>(par->color_space),
static_cast<int>(par->chroma_location),
static_cast<int>(par->video_delay)
); );
} }
#endif #endif
@ -282,7 +295,11 @@ void zm_dump_codec(const AVCodecContext *codec) {
codec->qmin, codec->qmin,
codec->qmax, codec->qmax,
codec->bit_rate, codec->bit_rate,
codec->extradata_size, ByteArrayToHexString(nonstd::span<const uint8>{codec->extradata, codec->extradata_size}).c_str() codec->extradata_size,
ByteArrayToHexString(nonstd::span<const uint8>{
codec->extradata,
static_cast<nonstd::span_lite::span<const unsigned char>::size_type>(codec->extradata_size)
}).c_str()
); );
} }