mirror
/
xbmc
mirror of https://github.com/xbmc/xbmc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27541 from cscd98/transcode-eac3 

webOS: transcode to DD+ instead of DD if eARC supported and enabled
This commit is contained in:
Stephan Sundermann 2025-12-14 20:01:57 +01:00 committed by GitHub
parent 8f12fca44d 487b2b9118
commit 1d1e03c26b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 127 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp
View File

@ -7,6 +7,7 @@
*/
#define AC3_ENCODE_BITRATE 640000
#define EAC3_ENCODE_BITRATE 768000
#define DTS_ENCODE_BITRATE 1411200
#include "cores/AudioEngine/Encoders/AEEncoderFFmpeg.h"
@ -85,16 +86,23 @@ unsigned int CAEEncoderFFmpeg::BuildChannelLayout(const int64_t ffmap, CAEChanne
return layout.Count();
}
bool CAEEncoderFFmpeg::Initialize(AEAudioFormat &format, bool allow_planar_input)
bool CAEEncoderFFmpeg::Initialize(AEAudioFormat& format, bool allow_planar_input)
{
Reset();
bool ac3 = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_AUDIOOUTPUT_AC3PASSTHROUGH);
const bool ac3 = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
CSettings::SETTING_AUDIOOUTPUT_AC3PASSTHROUGH);
const AVCodec* codec = nullptr;
/* fallback to ac3 if we support it, we might not have DTS support */
if (ac3)
if (format.m_streamInfo.m_type == CAEStreamInfo::STREAM_TYPE_EAC3)
{
m_CodecName = "EAC3";
m_CodecID = AV_CODEC_ID_EAC3;
m_BitRate = EAC3_ENCODE_BITRATE;
codec = avcodec_find_encoder(m_CodecID);
}
else if (ac3 || format.m_streamInfo.m_type == CAEStreamInfo::STREAM_TYPE_AC3)
{
m_CodecName = "AC3";
m_CodecID = AV_CODEC_ID_AC3;

63
xbmc/cores/VideoPlayer/MediaPipelineWebOS.cpp
View File

@ -22,6 +22,7 @@
#include "cores/AudioEngine/Encoders/AEEncoderFFmpeg.h"
#include "cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h"
#include "cores/AudioEngine/Interfaces/AE.h"
#include "cores/AudioEngine/Utils/AEStreamInfo.h"
#include "cores/AudioEngine/Utils/AEUtil.h"
#include "cores/VideoPlayer/Interface/DemuxCrypto.h"
#include "settings/SettingUtils.h"
@ -65,6 +66,7 @@ using namespace std::chrono_literals;
namespace
{
constexpr unsigned int AC3_MAX_SYNC_FRAME_SIZE = 3840;
constexpr unsigned int EAC3_MAX_SYNC_FRAME_SIZE = 6144;
constexpr int RESAMPLED_STREAM_ID = -1000;
constexpr unsigned int MIN_AUDIO_RESAMPLE_BUFFER_SIZE = 4096;
@ -211,8 +213,16 @@ void CMediaPipelineWebOS::UpdateAudioInfo()
const double kbps = m_audioStats.GetBitrate() / 1024.0;
std::scoped_lock lock(m_audioInfoMutex);
m_audioInfo = fmt::format("aq:{:02}% {:.3f}s {:.3f}Kb, Kb/s:{:.2f}{}", level, ts, kb, kbps,
m_audioEncoder ? ", transcoded ac3" : "");
std::string transcodedInfo;
if (m_audioEncoder)
{
transcodedInfo = fmt::format(
", transcoded {}", (m_audioEncoder->GetCodecID() == AV_CODEC_ID_EAC3) ? "eac3" : "ac3");
}
m_audioInfo =
fmt::format("aq:{:02}% {:.3f}s {:.3f}Kb, Kb/s:{:.2f}{}", level, ts, kb, kbps, transcodedInfo);
}
void CMediaPipelineWebOS::UpdateVideoInfo()
@ -310,8 +320,11 @@ bool CMediaPipelineWebOS::OpenAudioStream(CDVDStreamInfo& audioHint)
m_processInfo.SetAudioDecoderName("starfish-" +
std::string(ms_codecMap.at(audioHint.codec).data()));
else if (m_audioEncoder)
m_processInfo.SetAudioDecoderName("starfish-AC3 (transcoding)");
{
m_processInfo.SetAudioDecoderName((m_audioEncoder->GetCodecID() == AV_CODEC_ID_EAC3)
? "starfish-EAC3 (transcoding)"
: "starfish-AC3 (transcoding)");
}
return true;
}
// API introduced in webOS 6.0, so we need to handle older versions differently
@ -735,7 +748,11 @@ bool CMediaPipelineWebOS::Load(CDVDStreamInfo videoHint, CDVDStreamInfo audioHin
m_processInfo.SetAudioDecoderName(std::string("starfish-") +
ms_codecMap.at(audioHint.codec).data());
else if (m_audioEncoder)
m_processInfo.SetAudioDecoderName("starfish-AC3 (transcoding)");
{
m_processInfo.SetAudioDecoderName((m_audioEncoder->GetCodecID() == AV_CODEC_ID_EAC3)
? "starfish-EAC3 (transcoding)"
: "starfish-AC3 (transcoding)");
}
}
m_renderManager.ShowVideo(true);
@ -772,6 +789,14 @@ std::string CMediaPipelineWebOS::SetupAudio(CDVDStreamInfo& audioHint, CVariant&
m_audioResample = nullptr;
m_encoderBuffers = nullptr;
auto setAC3PlusInfo = [&](const CDVDStreamInfo& hint, CVariant& optInfo)
{
optInfo["ac3PlusInfo"]["channels"] = hint.channels;
optInfo["ac3PlusInfo"]["frequency"] = hint.samplerate / 1000.0;
if (hint.profile == AV_PROFILE_EAC3_DDP_ATMOS)
optInfo["ac3PlusInfo"]["channels"] = hint.channels + 2;
};
std::string codecName = "AC3";
if (!Supports(audioHint.codec, audioHint.profile))
{
@ -779,19 +804,20 @@ std::string CMediaPipelineWebOS::SetupAudio(CDVDStreamInfo& audioHint, CVariant&
CDVDCodecOptions options;
m_audioCodec->Open(audioHint, options);
m_audioEncoder = std::make_unique<CAEEncoderFFmpeg>();
if (WebOSTVPlatformConfig::SupportsEAC3())
{
codecName = "AC3 PLUS";
setAC3PlusInfo(audioHint, optInfo);
}
return codecName;
}
codecName = ms_codecMap.at(audioHint.codec);
if (audioHint.codec == AV_CODEC_ID_EAC3)
{
optInfo["ac3PlusInfo"]["channels"] = audioHint.channels;
optInfo["ac3PlusInfo"]["frequency"] = audioHint.samplerate / 1000.0;
if (audioHint.profile == AV_PROFILE_EAC3_DDP_ATMOS)
{
optInfo["ac3PlusInfo"]["channels"] = audioHint.channels + 2;
}
setAC3PlusInfo(audioHint, optInfo);
}
if (audioHint.codec == AV_CODEC_ID_AC4)
{
@ -1298,6 +1324,9 @@ void CMediaPipelineWebOS::ProcessAudio()
AEAudioFormat dstFormat = m_audioCodec->GetFormat();
dstFormat.m_sampleRate = SelectTranscodingSampleRate(dstFormat.m_sampleRate);
dstFormat.m_dataFormat = AE_FMT_FLOATP;
dstFormat.m_streamInfo.m_type = WebOSTVPlatformConfig::SupportsEAC3()
? CAEStreamInfo::DataType::STREAM_TYPE_EAC3
: CAEStreamInfo::DataType::STREAM_TYPE_AC3;
m_audioEncoder->Initialize(dstFormat, true);
const std::shared_ptr<CSettings> settings =
CServiceBroker::GetSettingsComponent()->GetSettings();
@ -1319,6 +1348,9 @@ void CMediaPipelineWebOS::ProcessAudio()
m_encoderBuffers->Create(0);
// Update process info with audio details
m_processInfo.SetAudioDecoderName((m_audioEncoder->GetCodecID() == AV_CODEC_ID_EAC3)
? "starfish-EAC3 (transcoding)"
: "starfish-AC3 (transcoding)");
m_processInfo.SetAudioChannels(frame.format.m_channelLayout);
m_processInfo.SetAudioSampleRate(frame.format.m_sampleRate);
m_processInfo.SetAudioBitsPerSample(frame.bits_per_sample);
@ -1352,10 +1384,13 @@ void CMediaPipelineWebOS::ProcessAudio()
{
for (const auto& buf : m_audioResample->m_outputSamples)
{
const unsigned int maxSize = (m_audioEncoder->GetCodecID() == AV_CODEC_ID_EAC3)
? EAC3_MAX_SYNC_FRAME_SIZE
: AC3_MAX_SYNC_FRAME_SIZE;
auto p = std::make_shared<CDVDMsgDemuxerPacket>(
CDVDDemuxUtils::AllocateDemuxPacket(AC3_MAX_SYNC_FRAME_SIZE));
CDVDDemuxUtils::AllocateDemuxPacket(maxSize));
p->m_packet->pts = static_cast<double>(buf->timestamp);
p->m_packet->iSize = AC3_MAX_SYNC_FRAME_SIZE;
p->m_packet->iSize = maxSize;
p->m_packet->iStreamId = RESAMPLED_STREAM_ID;
p->m_packet->iSize =
m_audioEncoder->Encode(buf->pkt->data[0], buf->pkt->planes * buf->pkt->linesize,

1
xbmc/platform/linux/PlatformWebOS.cpp
View File

@ -73,6 +73,7 @@ bool CPlatformWebOS::InitStageTwo()
CLog::Log(LOGERROR, "Failed to disable core dumps");
WebOSTVPlatformConfig::Load();
WebOSTVPlatformConfig::LoadARCStatus();
return CPlatformLinux::InitStageTwo();
}

51
xbmc/platform/linux/WebOSTVPlatformConfig.cpp
View File

@ -13,8 +13,6 @@
#include "utils/Variant.h"
#include "utils/log.h"
#include <webos-helpers/libhelpers.h>
namespace
{
constexpr const char* LUNA_GET_CONFIG = "luna://com.webos.service.config/getConfigs";
@ -30,6 +28,14 @@ constexpr const char* PLATFORM_CODE = "tv.nyx.platformCode";
constexpr const char* DTS = "dts";
constexpr const char* LUNA_ARC_STATUS = "luna://com.webos.service.arccontroller/getARCState";
constexpr const char* ARC_ACTIVATION = "arcActivation";
constexpr const char* EARC_CAPABILITY = "earcCapability";
constexpr const char* SUPPORT_EARCDDPlus = "eARCDDPlus";
constexpr const char* EARC = "eARC";
constexpr const char* DDPLUS = "DD+";
CVariant ms_config;
} // namespace
@ -75,3 +81,44 @@ bool WebOSTVPlatformConfig::SupportsHDR()
{
return ms_config[SUPPORT_HDR].asBoolean();
}
void WebOSTVPlatformConfig::LoadARCStatus()
{
m_requestContextARC->pub = true;
m_requestContextARC->multiple = true;
m_requestContextARC->callback = [](LSHandle* sh, LSMessage* msg, void* ctx) -> bool
{
auto* self = static_cast<WebOSTVPlatformConfig*>(ctx);
std::string message = HLunaServiceMessage(msg);
CLog::LogF(LOGDEBUG, "ARC controller: {}", message);
CVariant parsed;
if (!CJSONVariantParser::Parse(message, parsed))
{
CLog::LogF(LOGERROR, "Failed to parse ARC controller JSON");
return false;
}
const std::string arcActivation = parsed[ARC_ACTIVATION].asString();
if (arcActivation == EARC)
{
const CVariant& caps = parsed[EARC_CAPABILITY];
self->m_eAC3Supported =
caps.isArray() && std::any_of(caps.begin_array(), caps.end_array(),
[](const CVariant& v) { return v.asString() == DDPLUS; });
}
return true;
};
if (HLunaServiceCall(LUNA_ARC_STATUS, "{}", m_requestContextARC.get()))
{
CLog::LogF(LOGWARNING, "Luna ARC controller request call failed");
}
}
bool WebOSTVPlatformConfig::SupportsEAC3()
{
return m_eAC3Supported;
}

16
xbmc/platform/linux/WebOSTVPlatformConfig.h
View File

@ -8,13 +8,29 @@
#pragma once
#include <atomic>
#include <memory>
#include <webos-helpers/libhelpers.h>
class CVariant;
struct HContextDeleter
{
void operator()(HContext* ctx) const noexcept { HUnregisterServiceCallback(ctx); }
};
class WebOSTVPlatformConfig
{
private:
static inline std::unique_ptr<HContext, HContextDeleter> m_requestContextARC{new HContext{}};
static inline std::atomic<bool> m_eAC3Supported{false};
public:
static void Load();
static void LoadARCStatus();
static int GetWebOSVersion();
static bool SupportsDTS();
static bool SupportsHDR();
static bool SupportsEAC3();
};