Improve auto-detection of bitrate, and removed a debug print

plexinc · Jul 27, 2009 · 81bac7e · 81bac7e
1 parent bd75125
commit 81bac7e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/xbmc/cores/CoreAudioAUHAL.cpp b/xbmc/cores/CoreAudioAUHAL.cpp
@@ -514,7 +514,6 @@ int CoreAudioAUHAL::OpenPCM(struct CoreAudioDeviceParameters *deviceParameters,
 	deviceParameters->outputBuffer = (PaUtilRingBuffer *)malloc(sizeof(PaUtilRingBuffer));
 	deviceParameters->outputBufferData = malloc(framecount * deviceParameters->stream_format.mBytesPerFrame);
 
-	printf("Size of ring buffer is %d bytes.\n", deviceParameters->stream_format.mBytesPerFrame * framecount);
 	PaUtil_InitializeRingBuffer(deviceParameters->outputBuffer,
 								deviceParameters->stream_format.mBytesPerFrame,
 								framecount, deviceParameters->outputBufferData);

diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -880,7 +880,29 @@ int CDVDDemuxFFmpeg::GetStreamBitrate()
   if (!m_pFormatContext)
     return 0;
 
-  return m_pFormatContext->bit_rate;
+  // Get the bitrate of the file.
+  int overallBitrate = m_pFormatContext->bit_rate; 
+
+  // Get the aggregate bitrate of the streams.
+  int  aggregateBitrate = 0;
+  int  numStreams = GetNrOfStreams();
+  bool missingStreamInfo = false;
+
+  for (int i=0; i<numStreams; i++)
+  {
+    CDemuxStream* stream = GetStream(i);
+    aggregateBitrate += stream->iBitRate;
+
+    if (stream->iBitRate == 0)
+      missingStreamInfo = true;
+  }
+
+  printf("Aggregate bitrate = %d, file bitrate = %d.\n", aggregateBitrate, overallBitrate);
+
+  if (missingStreamInfo)
+    return overallBitrate;
+  else
+    return aggregateBitrate;
 }
 
 CDemuxStream* CDVDDemuxFFmpeg::GetStream(int iStreamId)