From c92c2f96b6ffbbf6969e28ba64953d32ed7ef509 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 9 Oct 2017 21:19:15 +0000 Subject: impoved ffmpeg plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7537 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 25 ++++++++---------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp') diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index a493d4401..2e4dfbd80 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -48,28 +48,19 @@ QHash FFmpegMetaDataModel::audioProperties() QString text = QString("%1").arg(int(m_in->duration/AV_TIME_BASE)/60); text +=":"+QString("%1").arg(int(m_in->duration/AV_TIME_BASE)%60,2,10,QChar('0')); ap.insert(tr("Length"), text); - ap.insert(tr("File size"), QString("%1 ").arg(avio_size(m_in->pb)) + " " + tr("KB")); - ap.insert(tr("Bitrate"), QString("%1 "+tr("kbps")).arg(m_in->bit_rate/1000)); + ap.insert(tr("File size"), tr("%1 KB").arg(avio_size(m_in->pb) / 1000)); + ap.insert(tr("Bitrate"), tr("%1 kbps").arg(m_in->bit_rate/1000)); -#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(48<<8)+0)) //ffmpeg-3.1: 57.48.101 - AVCodecParameters *c = 0; -#else - AVCodecContext *c = 0; -#endif - uint idx; - for (idx = 0; idx < m_in->nb_streams; idx++) + int idx = av_find_best_stream(m_in, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0); + + if(idx >= 0) { #if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(48<<8)+0)) //ffmpeg-3.1: 57.48.101 - c = m_in->streams[idx]->codecpar; + AVCodecParameters *c = m_in->streams[idx]->codecpar; #else - c = m_in->streams[idx]->codec; + AVCodecContext *c = m_in->streams[idx]->codec; #endif - if (c->codec_type == AVMEDIA_TYPE_AUDIO) - break; - } - if (c) - { - ap.insert(tr("Sample rate"), QString("%1 " + tr("Hz")).arg(c->sample_rate)); + ap.insert(tr("Sample rate"), tr("%1 Hz").arg(c->sample_rate)); ap.insert(tr("Channels"), QString("%1").arg(c->channels)); } return ap; -- cgit v1.2.3-13-gbd6f