Skip to content

opusinfo: Add total playback samples to output (#40) #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anthumchris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

opusinfo: Add total playback samples to output (#40) #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/info_opus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,17 @@ void info_opus_end(stream_processor *stream)
if(inf && inf->total_packets>0){
int i, j;
long minutes, seconds, milliseconds;
ogg_int64_t playback_samples;
double time;
time = (inf->lastgranulepos-inf->firstgranule-inf->oh.preskip) / 48000.;
playback_samples = inf->lastgranulepos-inf->firstgranule-inf->oh.preskip;
time = playback_samples / 48000.;
if(time<=0)time=0;
minutes = (long)(time) / 60;
seconds = (long)(time - minutes*60);
milliseconds = (long)((time - minutes*60 - seconds)*1000);
if(inf->lastgranulepos-inf->firstgranule<inf->oh.preskip)
oi_error(_("\tERROR: stream %d has a negative duration: %" PRId64 "-%" PRId64 "-%d=%" PRId64 "\n"),stream->num,
inf->lastgranulepos,inf->firstgranule,inf->oh.preskip,inf->lastgranulepos-inf->firstgranule-inf->oh.preskip);
inf->lastgranulepos,inf->firstgranule,inf->oh.preskip,playback_samples);
if((inf->total_samples-inf->last_page_duration)>(inf->lastgranulepos-inf->firstgranule))
oi_error(_("\tERROR: stream %d has interior holes or more than one page of end trimming\n"),stream->num);
if(inf->last_eos &&( (inf->last_page_duration-inf->last_packet_duration)>(inf->lastgranulepos-inf->lastlastgranulepos)))
Expand Down Expand Up @@ -309,6 +311,7 @@ void info_opus_end(stream_processor *stream)
if(inf->total_pages)oi_info(_("\tPage duration: %8.1fms (max), %6.1fms (avg), %6.1fms (min)\n"),
inf->max_page_duration/48.,inf->total_samples/(double)inf->total_pages/48.,inf->min_page_duration/48.);
oi_info(_("\tTotal data length: %" PRId64 " bytes (overhead: %0.3g%%)\n"),inf->bytes,(double)inf->overhead_bytes/inf->bytes*100.);
oi_info(_("\tPlayback samples: %" PRId64 "\n"), playback_samples);
oi_info(_("\tPlayback length: %ldm:%02ld.%03lds\n"), minutes, seconds, milliseconds);
oi_info(_("\tAverage bitrate: %0.4g kbit/s, w/o overhead: %.04g kbit/s%s\n"),time<=0?0:inf->bytes*8/time/1000.0,
time<=0?0:(inf->bytes-inf->overhead_bytes)*8/time/1000.0,
Expand Down