X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_audio_stream.h;h=a5ed90c972e46f0a6297ff31eb17810bd8026fa3;hb=9a97c1b4116d7fb80e8ab145c0cc738dbf14d617;hp=31ec9d125e550daa4688a913cd0081aa0c7f9440;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h index 31ec9d125..a5ed90c97 100644 --- a/src/lib/ffmpeg_audio_stream.h +++ b/src/lib/ffmpeg_audio_stream.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,12 +18,15 @@ */ -#include "ffmpeg_stream.h" + #include "audio_stream.h" #include "dcpomatic_time.h" +#include "ffmpeg_stream.h" + struct ffmpeg_pts_offset_test; + class FFmpegAudioStream : public FFmpegStream, public AudioStream { public: @@ -32,6 +35,12 @@ public: , AudioStream (frame_rate, length, channels) {} + FFmpegAudioStream (std::string name, std::string codec_name_, int id, int frame_rate, Frame length, int channels) + : FFmpegStream (name, id) + , AudioStream (frame_rate, length, channels) + , codec_name (codec_name_) + {} + FFmpegAudioStream (std::string name, int id, int frame_rate, Frame length, AudioMapping mapping) : FFmpegStream (name, id) , AudioStream (frame_rate, length, mapping) @@ -43,7 +52,8 @@ public: /* XXX: should probably be locked */ - boost::optional first_audio; + boost::optional first_audio; + boost::optional codec_name; private: friend struct ffmpeg_pts_offset_test; @@ -54,3 +64,4 @@ private: , AudioStream (0, 0, 0) {} }; +