projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated es_ES translation from Manuel AC.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_audio_stream.h
diff --git
a/src/lib/ffmpeg_audio_stream.h
b/src/lib/ffmpeg_audio_stream.h
index 31ec9d125e550daa4688a913cd0081aa0c7f9440..a5ed90c972e46f0a6297ff31eb17810bd8026fa3 100644
(file)
--- a/
src/lib/ffmpeg_audio_stream.h
+++ b/
src/lib/ffmpeg_audio_stream.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
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 "audio_stream.h"
#include "dcpomatic_time.h"
+#include "ffmpeg_stream.h"
+
struct ffmpeg_pts_offset_test;
struct ffmpeg_pts_offset_test;
+
class FFmpegAudioStream : public FFmpegStream, public AudioStream
{
public:
class FFmpegAudioStream : public FFmpegStream, public AudioStream
{
public:
@@
-32,6
+35,12
@@
public:
, AudioStream (frame_rate, length, channels)
{}
, 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)
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 */
/* XXX: should probably be locked */
- boost::optional<ContentTime> first_audio;
+ boost::optional<dcpomatic::ContentTime> first_audio;
+ boost::optional<std::string> codec_name;
private:
friend struct ffmpeg_pts_offset_test;
private:
friend struct ffmpeg_pts_offset_test;
@@
-54,3
+64,4
@@
private:
, AudioStream (0, 0, 0)
{}
};
, AudioStream (0, 0, 0)
{}
};
+