har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/eac3dec: add detection of Atmos spatial extension profile

Browse Source 
Signed-off-by: Marth64 <marth64@proxyid.net>
This commit is contained in:
Marth64 2023-02-18 13:43:00 -06:00 committed by Hendrik Leppkes
parent 814178f926
commit a4e5b94633
No known key found for this signature in database
GPG Key ID: 846079A4B0A7C1B5
8 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ac3dec.c
View File

@ -1714,6 +1714,7 @@ skip:
if (!err) { if (!err) {
avctx->sample_rate = s->sample_rate; avctx->sample_rate = s->sample_rate;
avctx->bit_rate = s->bit_rate + s->prev_bit_rate; avctx->bit_rate = s->bit_rate + s->prev_bit_rate;
avctx->profile = s->eac3_extension_type_a == 1 ? FF_PROFILE_EAC3_DDP_ATMOS : FF_PROFILE_UNKNOWN;
} }
if (!avctx->sample_rate) { if (!avctx->sample_rate) {

1
libavcodec/ac3dec.h
View File

@ -102,6 +102,7 @@ typedef struct AC3DecodeContext {
int eac3; ///< indicates if current frame is E-AC-3 int eac3; ///< indicates if current frame is E-AC-3
int eac3_frame_dependent_found; ///< bitstream has E-AC-3 dependent frame(s) int eac3_frame_dependent_found; ///< bitstream has E-AC-3 dependent frame(s)
int eac3_subsbtreamid_found; ///< bitstream has E-AC-3 additional substream(s) int eac3_subsbtreamid_found; ///< bitstream has E-AC-3 additional substream(s)
int eac3_extension_type_a; ///< bitstream has E-AC-3 extension type A enabled frame(s)
int dolby_surround_mode; ///< dolby surround mode (dsurmod) int dolby_surround_mode; ///< dolby surround mode (dsurmod)
int dolby_surround_ex_mode; ///< dolby surround ex mode (dsurexmod) int dolby_surround_ex_mode; ///< dolby surround ex mode (dsurexmod)
int dolby_headphone_mode; ///< dolby headphone mode (dheadphonmod) int dolby_headphone_mode; ///< dolby headphone mode (dheadphonmod)

2
libavcodec/ac3dec_float.c
View File

@ -33,6 +33,7 @@
#include "ac3dec.h" #include "ac3dec.h"
#include "codec_internal.h" #include "codec_internal.h"
#include "profiles.h"
#include "eac3dec.c" #include "eac3dec.c"
#include "ac3dec.c" #include "ac3dec.c"
@ -92,6 +93,7 @@ const FFCodec ff_eac3_decoder = {
.p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.p.priv_class = &ac3_eac3_decoder_class, .p.priv_class = &ac3_eac3_decoder_class,
.p.profiles = NULL_IF_CONFIG_SMALL(ff_eac3_profiles),
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
}; };
#endif #endif

2
libavcodec/avcodec.h
View File

@ -1591,6 +1591,8 @@ typedef struct AVCodecContext {
#define FF_PROFILE_DTS_HD_MA 60 #define FF_PROFILE_DTS_HD_MA 60
#define FF_PROFILE_DTS_EXPRESS 70 #define FF_PROFILE_DTS_EXPRESS 70
#define FF_PROFILE_EAC3_DDP_ATMOS 30
#define FF_PROFILE_MPEG2_422 0 #define FF_PROFILE_MPEG2_422 0
#define FF_PROFILE_MPEG2_HIGH 1 #define FF_PROFILE_MPEG2_HIGH 1
#define FF_PROFILE_MPEG2_SS 2 #define FF_PROFILE_MPEG2_SS 2

1
libavcodec/codec_desc.c
View File

@ -2931,6 +2931,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.name = "eac3", .name = "eac3",
.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
.profiles = NULL_IF_CONFIG_SMALL(ff_eac3_profiles),
}, },
{ {
.id = AV_CODEC_ID_SIPR, .id = AV_CODEC_ID_SIPR,

9
libavcodec/eac3dec.c
View File

@ -464,9 +464,18 @@ static int ff_eac3_parse_header(AC3DecodeContext *s)
if (get_bits1(gbc)) { if (get_bits1(gbc)) {
int addbsil = get_bits(gbc, 6); int addbsil = get_bits(gbc, 6);
for (i = 0; i < addbsil + 1; i++) { for (i = 0; i < addbsil + 1; i++) {
if (i == 0) {
/* In this 8 bit chunk, the LSB is equal to flag_ec3_extension_type_a
which can be used to detect Atmos presence */
skip_bits(gbc, 7);
if (get_bits1(gbc)) {
s->eac3_extension_type_a = 1;
}
} else {
skip_bits(gbc, 8); // skip additional bit stream info skip_bits(gbc, 8); // skip additional bit stream info
} }
} }
}
/* audio frame syntax flags, strategy data, and per-frame data */ /* audio frame syntax flags, strategy data, and per-frame data */

5
libavcodec/profiles.c
View File

@ -45,6 +45,11 @@ const AVProfile ff_dca_profiles[] = {
{ FF_PROFILE_UNKNOWN }, { FF_PROFILE_UNKNOWN },
}; };
const AVProfile ff_eac3_profiles[] = {
{ FF_PROFILE_EAC3_DDP_ATMOS, "Dolby Digital Plus + Dolby Atmos"},
{ FF_PROFILE_UNKNOWN },
};
const AVProfile ff_dnxhd_profiles[] = { const AVProfile ff_dnxhd_profiles[] = {
{ FF_PROFILE_DNXHD, "DNXHD"}, { FF_PROFILE_DNXHD, "DNXHD"},
{ FF_PROFILE_DNXHR_LB, "DNXHR LB"}, { FF_PROFILE_DNXHR_LB, "DNXHR LB"},

1
libavcodec/profiles.h
View File

@ -58,6 +58,7 @@
extern const AVProfile ff_aac_profiles[]; extern const AVProfile ff_aac_profiles[];
extern const AVProfile ff_dca_profiles[]; extern const AVProfile ff_dca_profiles[];
extern const AVProfile ff_eac3_profiles[];
extern const AVProfile ff_dnxhd_profiles[]; extern const AVProfile ff_dnxhd_profiles[];
extern const AVProfile ff_h264_profiles[]; extern const AVProfile ff_h264_profiles[];
extern const AVProfile ff_hevc_profiles[]; extern const AVProfile ff_hevc_profiles[];