X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.h;h=cc8f2ce069d8bc9ed3093facc45343e7387a55d1;hb=1dc40e9c0e2758619ce5bda802cd32371aee5829;hp=17767b3a04fe4bf52047dcfb67c5f396bed232bb;hpb=6a5bb039b3bfd508cc87b6b15102b9eb60c62f8d;p=libdcp.git diff --git a/src/sound_asset.h b/src/sound_asset.h index 17767b3a..cc8f2ce0 100644 --- a/src/sound_asset.h +++ b/src/sound_asset.h @@ -1,152 +1,126 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ -#ifndef LIBDCP_SOUND_ASSET_H -#define LIBDCP_SOUND_ASSET_H - /** @file src/sound_asset.h - * @brief An asset made up of PCM audio data files + * @brief SoundAsset class */ -#include "AS_DCP.h" -#include "mxf_asset.h" +#ifndef LIBDCP_SOUND_ASSET_H +#define LIBDCP_SOUND_ASSET_H + +#include "mxf.h" #include "types.h" +#include "language_tag.h" +#include "metadata.h" +#include "sound_frame.h" +#include "sound_asset_reader.h" -namespace libdcp -{ -class SoundFrame; +namespace dcp { + class SoundAsset; +} -class SoundAsset; +extern std::shared_ptr simple_sound ( + boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate + ); -class SoundAssetWriter -{ -public: - ~SoundAssetWriter (); - void write (float const * const *, int); - void finalize (); +namespace dcp +{ -private: - friend class SoundAsset; - - SoundAssetWriter (SoundAsset *); - void write_current_frame (); - - SoundAsset* _asset; - bool _finalized; - int _frames_written; - int _frame_buffer_offset; - ASDCP::PCM::MXFWriter _mxf_writer; - ASDCP::PCM::FrameBuffer _frame_buffer; - ASDCP::WriterInfo _writer_info; - ASDCP::PCM::AudioDescriptor _audio_desc; -}; +class SoundAssetWriter; -/** @brief An asset made up of WAV files */ -class SoundAsset : public MXFAsset +/** @class SoundAsset + * @brief Representation of a sound asset + */ +class SoundAsset : public Asset, public MXF { public: - /** Construct a SoundAsset, generating the MXF from some WAV files. - * This may take some time; progress is indicated by emission of the Progress signal. - * @param files Pathnames of sound files, in the order Left, Right, Centre, Lfe (sub), Left surround, Right surround. - * @param directory Directory in which to create MXF file. - * @param mxf_name Name of MXF file to create. - * @param progress Signal to inform of progress. - * @param fps Frames per second. - * @param intrinsic_duration Length of the whole asset in frames. - * @param start_frame Frame in the source to start writing from. - * Note that this is different to entry_point in that the asset will contain no data before start_frame. - */ - SoundAsset ( - std::vector const & files, - std::string directory, - std::string mxf_name, - boost::signals2::signal* progress, - int fps, - int intrinsic_duration, - int start_frame - ); + explicit SoundAsset (boost::filesystem::path file); + SoundAsset (Fraction edit_rate, int sampling_rate, int channels, LanguageTag language, Standard standard); - /** Construct a SoundAsset, generating the MXF from some WAV files. - * This may take some time; progress is indicated by emission of the Progress signal. - * @param get_path Functor which returns a WAV file path for a given channel. - * @param directory Directory in which to create MXF file. - * @param mxf_name Name of MXF file to create. - * @param progress Signal to inform of progress. - * @param fps Frames per second. - * @param intrinsic_duration Length of the whole asset in frames. - * @param start_frame Frame in the source to start writing from. - * Note that this is different to entry_point in that the asset will contain no data before start_frame. - * @param channels Number of audio channels. - */ - SoundAsset ( - boost::function get_path, - std::string directory, - std::string mxf_name, - boost::signals2::signal* progress, - int fps, - int intrinsic_duration, - int start_frame, - int channels - ); + std::shared_ptr start_write (boost::filesystem::path file, std::vector active_channels, bool atmos_sync = false); + std::shared_ptr start_read () const; - SoundAsset ( - std::string directory, - std::string mxf_name - ); + bool equals ( + std::shared_ptr other, + EqualityOptions opt, + NoteHandler note + ) const; - SoundAsset ( - std::string directory, - std::string mxf_name, - int fps, - int channels, - int sampling_rate - ); - - boost::shared_ptr start_write (); - - /** Write details of this asset to a CPL stream. - * @param s Stream. - */ - void write_to_cpl (std::ostream& s) const; - - bool equals (boost::shared_ptr other, EqualityOptions opt, std::list& notes) const; - - boost::shared_ptr get_frame (int n) const; - + /** @return number of channels */ int channels () const { return _channels; } + /** @return sampling rate in Hz */ int sampling_rate () const { return _sampling_rate; } + Fraction edit_rate () const { + return _edit_rate; + } + + int64_t intrinsic_duration () const { + return _intrinsic_duration; + } + + std::string language () const { + return _language; + } + + static bool valid_mxf (boost::filesystem::path); + static std::string static_pkl_type (Standard standard); + private: - void construct (boost::function get_path); - std::string path_from_channel (Channel channel, std::vector const & files); + friend class SoundAssetWriter; + friend std::shared_ptr (::simple_sound) ( + boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate + ); + + std::string pkl_type (Standard standard) const { + return static_pkl_type (standard); + } - /** Number of channels in the asset */ - int _channels; - int _sampling_rate; - int _start_frame; + Fraction _edit_rate; + /** The total length of this content in video frames. The amount of + * content presented may be less than this. + */ + int64_t _intrinsic_duration; + int _channels; ///< number of channels + int _sampling_rate; ///< sampling rate in Hz + std::string _language; }; }