#include "util.h"
#include "safe_stringstream.h"
#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
#include <iostream>
#include "i18n.h"
using std::cout;
using std::max;
using boost::shared_ptr;
+using boost::make_shared;
using boost::optional;
/** @param job job that the examiner is operating in, or 0 */
}
DCPOMATIC_ASSERT (_format_context->duration != AV_NOPTS_VALUE);
+ DCPOMATIC_ASSERT (s->codec->codec);
+ DCPOMATIC_ASSERT (s->codec->codec->name);
_audio_streams.push_back (
shared_ptr<FFmpegAudioStream> (
new FFmpegAudioStream (
- audio_stream_name (s),
+ stream_name (s),
+ s->codec->codec->name,
s->id,
s->codec->sample_rate,
(double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate,
);
} else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
- _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (subtitle_stream_name (s), s->id)));
+ _subtitle_streams.push_back (boost::make_shared<FFmpegSubtitleStream> (subtitle_stream_name (s), s->id));
}
}
return double (sar.num) / sar.den;
}
-string
-FFmpegExaminer::audio_stream_name (AVStream* s) const
-{
- SafeStringStream n;
-
- n << stream_name (s);
-
- if (!n.str().empty()) {
- n << "; ";
- }
-
- n << s->codec->channels << " channels";
-
- return n.str ();
-}
-
string
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
{