Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

demux_lavf: utilize side data getter for replaygain

Browse Source 
This simplifies the code, not requiring a loop.

Moves the getter definition somewhat upwards to allow
for its usage in a function that was defined before it.
This commit is contained in:
Jan Ekström
2020-12-19 16:45:49 +02:00
committed by Kacper Michajłow
parent f75304957a
commit 1f86733bb3
1 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
demux/demux_lavf.c
View File

@@ -600,51 +600,55 @@ static void select_tracks(struct demuxer *demuxer, int start)
} }
} }
static inline const uint8_t *mp_av_stream_get_side_data(const AVStream *st,
enum AVPacketSideDataType type)
{
const AVPacketSideData *sd;
sd = av_packet_side_data_get(st->codecpar->coded_side_data,
st->codecpar->nb_coded_side_data,
type);
return sd ? sd->data : NULL;
}
static void export_replaygain(demuxer_t *demuxer, struct sh_stream *sh, static void export_replaygain(demuxer_t *demuxer, struct sh_stream *sh,
AVStream *st) AVStream *st)
{ {
AVPacketSideData *side_data = st->codecpar->coded_side_data; const AVReplayGain *av_rgain =
int nb_side_data = st->codecpar->nb_coded_side_data; (const AVReplayGain *)mp_av_stream_get_side_data(st, AV_PKT_DATA_REPLAYGAIN);
for (int i = 0; i < nb_side_data; i++) { if (!av_rgain)
AVReplayGain *av_rgain; return;
struct replaygain_data *rgain;
AVPacketSideData *src_sd = &side_data[i];
if (src_sd->type != AV_PKT_DATA_REPLAYGAIN) struct replaygain_data *rgain = talloc_ptrtype(demuxer, rgain);
continue;
av_rgain = (AVReplayGain*)src_sd->data; rgain->track_gain = rgain->album_gain = 0;
rgain = talloc_ptrtype(demuxer, rgain); rgain->track_peak = rgain->album_peak = 1;
rgain->track_gain = rgain->album_gain = 0;
rgain->track_peak = rgain->album_peak = 1;
// Set values in *rgain, using track gain as a fallback for album gain // Set values in *rgain, using track gain as a fallback for album gain
// if the latter is not present. This behavior matches that in // if the latter is not present. This behavior matches that in
// demux/demux.c's decode_rgain; if you change this, please make // demux/demux.c's decode_rgain; if you change this, please make
// equivalent changes there too. // equivalent changes there too.
if (av_rgain->track_gain != INT32_MIN && av_rgain->track_peak != 0.0) { if (av_rgain->track_gain != INT32_MIN && av_rgain->track_peak != 0.0) {
// Track gain is defined. // Track gain is defined.
rgain->track_gain = av_rgain->track_gain / 100000.0f; rgain->track_gain = av_rgain->track_gain / 100000.0f;
rgain->track_peak = av_rgain->track_peak / 100000.0f; rgain->track_peak = av_rgain->track_peak / 100000.0f;
if (av_rgain->album_gain != INT32_MIN && if (av_rgain->album_gain != INT32_MIN &&
av_rgain->album_peak != 0.0) av_rgain->album_peak != 0.0)
{ {
// Album gain is also defined. // Album gain is also defined.
rgain->album_gain = av_rgain->album_gain / 100000.0f; rgain->album_gain = av_rgain->album_gain / 100000.0f;
rgain->album_peak = av_rgain->album_peak / 100000.0f; rgain->album_peak = av_rgain->album_peak / 100000.0f;
} else { } else {
// Album gain is undefined; fall back to track gain. // Album gain is undefined; fall back to track gain.
rgain->album_gain = rgain->track_gain; rgain->album_gain = rgain->track_gain;
rgain->album_peak = rgain->track_peak; rgain->album_peak = rgain->track_peak;
}
} }
// This must be run only before the stream was added, otherwise there
// will be race conditions with accesses from the user thread.
assert(!sh->ds);
sh->codec->replaygain_data = rgain;
} }
// This must be run only before the stream was added, otherwise there
// will be race conditions with accesses from the user thread.
assert(!sh->ds);
sh->codec->replaygain_data = rgain;
} }
// Return a dictionary entry as (decimal) integer. // Return a dictionary entry as (decimal) integer.
@@ -673,16 +677,6 @@ static bool is_image(AVStream *st, bool attached_picture, const AVInputFormat *a
); );
} }
static inline const uint8_t *mp_av_stream_get_side_data(const AVStream *st,
enum AVPacketSideDataType type)
{
const AVPacketSideData *sd;
sd = av_packet_side_data_get(st->codecpar->coded_side_data,
st->codecpar->nb_coded_side_data,
type);
return sd ? sd->data : NULL;
}
static void handle_new_stream(demuxer_t *demuxer, int i) static void handle_new_stream(demuxer_t *demuxer, int i)
{ {
lavf_priv_t *priv = demuxer->priv; lavf_priv_t *priv = demuxer->priv;