From 699fe77b5d7ad11a0f18f79c85141da1b282bb83 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 1 Jun 2013 15:41:32 +0200 Subject: [PATCH] generic-pc: improve decoder info messages Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/94830cf33ff1ac3fd385935761a64be7165a4f85 Author: Stefan Seyfried Date: 2013-06-01 (Sat, 01 Jun 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- generic-pc/audio.cpp | 8 +++++--- generic-pc/video.cpp | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/generic-pc/audio.cpp b/generic-pc/audio.cpp index ad91df5..8d6f317 100644 --- a/generic-pc/audio.cpp +++ b/generic-pc/audio.cpp @@ -329,6 +329,7 @@ void cAudio::run() int obuf_sz_max = 0; int o_ch, o_sr; /* output channels and sample rate */ uint64_t o_layout; /* output channels layout */ + char tmp[64] = "unknown"; curr_pts = 0; av_init_packet(&avpkt); @@ -362,7 +363,7 @@ void cAudio::run() c = avfc->streams[0]->codec; codec = avcodec_find_decoder(c->codec_id); if (!codec) { - lt_info("%s: Codec not found\n", __func__); + lt_info("%s: Codec for %s not found\n", __func__, avcodec_get_name(c->codec_id)); goto out; } if (avcodec_open2(c, codec, NULL) < 0) { @@ -402,8 +403,9 @@ void cAudio::run() fprintf(stderr, " %s", ai->options[i]); fprintf(stderr, "\n"); #endif - lt_info("codec params: sample_fmt %d sample_rate %d channels %d\n", - c->sample_fmt, c->sample_rate, c->channels); + av_get_sample_fmt_string(tmp, sizeof(tmp), c->sample_fmt); + lt_info("decoding %s, sample_fmt %d (%s) sample_rate %d channels %d\n", + avcodec_get_name(c->codec_id), c->sample_fmt, tmp, c->sample_rate, c->channels); swr = swr_alloc_set_opts(swr, o_layout, AV_SAMPLE_FMT_S16, o_sr, /* output */ c->channel_layout, c->sample_fmt, c->sample_rate, /* input */ diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp index 2164be1..92ee802 100644 --- a/generic-pc/video.cpp +++ b/generic-pc/video.cpp @@ -445,7 +445,7 @@ void cVideo::run(void) c = avfc->streams[0]->codec; codec = avcodec_find_decoder(c->codec_id); if (!codec) { - lt_info("%s: Codec not found\n", __func__); + lt_info("%s: Codec for %s not found\n", __func__, avcodec_get_name(c->codec_id)); goto out; } if (avcodec_open2(c, codec, NULL) < 0) { @@ -458,6 +458,7 @@ void cVideo::run(void) lt_info("%s: Could not allocate video frame\n", __func__); goto out2; } + lt_info("decoding %s\n", avcodec_get_name(c->codec_id)); while (thread_running) { if (av_read_frame(avfc, &avpkt) < 0) { if (warn_r - time(NULL) > 4) {