command: improve video-bitrate property

Signed-off-by: wm4 <wm4@nowhere>

Includes some cosmetic changes over the original PR.
This commit is contained in:
Andrey Morozov 2014-05-07 15:55:02 -03:00 committed by wm4
parent ae09c0d8eb
commit b5e40e15a3
2 changed files with 7 additions and 1 deletions

View File

@ -477,7 +477,10 @@ static void handle_stream(demuxer_t *demuxer, int i)
else
sh_video->aspect = codec->width * codec->sample_aspect_ratio.num
/ (float)(codec->height * codec->sample_aspect_ratio.den);
sh_video->bitrate = codec->bit_rate;
if (sh_video->bitrate == 0)
sh_video->bitrate = avfc->bit_rate;
AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate", NULL, 0);
if (rot && rot->value) {

View File

@ -105,7 +105,10 @@ static void mark_seek(struct MPContext *mpctx)
static char *format_bitrate(int rate)
{
return talloc_asprintf(NULL, "%d kbps", rate / 1000);
if (rate < 1024 * 1024)
return talloc_asprintf(NULL, "%.3f kbps", rate * 8.0 / 1000.0);
return talloc_asprintf(NULL, "%.3f mbps", rate * 8.0 / 1000000.0);
}
static char *format_file_size(int64_t size)