Merge pull request #1587 from ThomasWilshaw/optimise_audio
Small audio caching optimisation
This commit is contained in:
@@ -141,7 +141,7 @@ rational AudioParams::bytes_to_time(const qint64 &bytes) const
|
|||||||
|
|
||||||
int AudioParams::channel_count() const
|
int AudioParams::channel_count() const
|
||||||
{
|
{
|
||||||
return av_get_channel_layout_nb_channels(channel_layout());
|
return channel_count_;
|
||||||
}
|
}
|
||||||
|
|
||||||
int AudioParams::bytes_per_sample_per_channel() const
|
int AudioParams::bytes_per_sample_per_channel() const
|
||||||
|
|||||||
@@ -66,6 +66,9 @@ public:
|
|||||||
format_(kFormatInvalid)
|
format_(kFormatInvalid)
|
||||||
{
|
{
|
||||||
set_default_footage_parameters();
|
set_default_footage_parameters();
|
||||||
|
|
||||||
|
// Cache channel count
|
||||||
|
calculate_channel_count();
|
||||||
}
|
}
|
||||||
|
|
||||||
AudioParams(const int& sample_rate, const uint64_t& channel_layout, const Format& format) :
|
AudioParams(const int& sample_rate, const uint64_t& channel_layout, const Format& format) :
|
||||||
@@ -75,6 +78,9 @@ public:
|
|||||||
{
|
{
|
||||||
set_default_footage_parameters();
|
set_default_footage_parameters();
|
||||||
timebase_ = sample_rate_as_time_base();
|
timebase_ = sample_rate_as_time_base();
|
||||||
|
|
||||||
|
// Cache channel count
|
||||||
|
calculate_channel_count();
|
||||||
}
|
}
|
||||||
|
|
||||||
int sample_rate() const
|
int sample_rate() const
|
||||||
@@ -95,6 +101,7 @@ public:
|
|||||||
void set_channel_layout(uint64_t channel_layout)
|
void set_channel_layout(uint64_t channel_layout)
|
||||||
{
|
{
|
||||||
channel_layout_ = channel_layout;
|
channel_layout_ = channel_layout;
|
||||||
|
calculate_channel_count();
|
||||||
}
|
}
|
||||||
|
|
||||||
rational time_base() const
|
rational time_base() const
|
||||||
@@ -197,10 +204,17 @@ private:
|
|||||||
duration_ = 0;
|
duration_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void calculate_channel_count()
|
||||||
|
{
|
||||||
|
channel_count_ = av_get_channel_layout_nb_channels(channel_layout());
|
||||||
|
}
|
||||||
|
|
||||||
int sample_rate_;
|
int sample_rate_;
|
||||||
|
|
||||||
uint64_t channel_layout_;
|
uint64_t channel_layout_;
|
||||||
|
|
||||||
|
int channel_count_;
|
||||||
|
|
||||||
Format format_;
|
Format format_;
|
||||||
|
|
||||||
// Footage-specific
|
// Footage-specific
|
||||||
|
|||||||
Reference in New Issue
Block a user