Skip to content

Commit

Permalink
Merge pull request xbmc#23639 from rmrector/chapter-thumb-gen
Browse files Browse the repository at this point in the history 
[guilib][vfs][imagecache] Load video chapter images into texture cache when viewed, like standard images
  • Loading branch information
@rmrector
rmrector authored Sep 20, 2023
2 parents 86baa0a + 0bfa18e commit c57bca1
Show file tree
Hide file tree
Showing 13 changed files with 149 additions and 407 deletions.
2 changes: 1 addition & 1 deletion xbmc/TextureCache.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void CTextureCache::OnCachingComplete(bool success, CTextureCacheJob *job)
{
if (success)
{
if (job->m_oldHash == job->m_details.hash)
if (job->m_details.id != -1 && job->m_oldHash == job->m_details.hash)
SetCachedTextureValid(job->m_url, job->m_details.updateable);
else
AddCachedTexture(job->m_url, job->m_details);
Expand Down
6 changes: 6 additions & 0 deletions xbmc/TextureCacheJob.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ std::string CTextureCacheJob::DecodeImageURL(const std::string &url, unsigned in
scalingAlgorithm = CPictureScalingAlgorithm::FromString(thumbURL.GetOption("scaling_algorithm"));
}

if (StringUtils::StartsWith(url, "chapter://"))
{
// workaround for chapter thumbnail paths, which don't yet conform to the image:// path.
additional_info = "videochapter";
}

// Handle special case about audiodecoder addon music files, e.g. SACD
if (StringUtils::EndsWith(URIUtils::GetExtension(image), KODI_ADDON_AUDIODECODER_TRACK_EXT))
{
Expand Down
281 changes: 42 additions & 239 deletions xbmc/cores/VideoPlayer/DVDFileInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,190 +87,8 @@ int DegreeToOrientation(int degrees)
}
}

bool CDVDFileInfo::ExtractThumb(const CFileItem& fileItem, CTextureDetails& details, int64_t pos)
{
const std::string redactPath = CURL::GetRedacted(fileItem.GetPath());
auto start = std::chrono::steady_clock::now();

CFileItem item(fileItem);
item.SetMimeTypeForInternetFile();
auto pInputStream = CDVDFactoryInputStream::CreateInputStream(NULL, item);
if (!pInputStream)
{
CLog::Log(LOGERROR, "InputStream: Error creating stream for {}", redactPath);
return false;
}

if (!pInputStream->Open())
{
CLog::Log(LOGERROR, "InputStream: Error opening, {}", redactPath);
return false;
}

CDVDDemux *pDemuxer = NULL;

try
{
pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(pInputStream, true);
if(!pDemuxer)
{
CLog::Log(LOGERROR, "{} - Error creating demuxer", __FUNCTION__);
return false;
}
}
catch(...)
{
CLog::Log(LOGERROR, "{} - Exception thrown when opening demuxer", __FUNCTION__);
if (pDemuxer)
delete pDemuxer;

return false;
}

int nVideoStream = -1;
int64_t demuxerId = -1;
for (CDemuxStream* pStream : pDemuxer->GetStreams())
{
if (pStream)
{
// ignore if it's a picture attachment (e.g. jpeg artwork)
if (pStream->type == STREAM_VIDEO && !(pStream->flags & AV_DISPOSITION_ATTACHED_PIC))
{
nVideoStream = pStream->uniqueId;
demuxerId = pStream->demuxerId;
}
else
pDemuxer->EnableStream(pStream->demuxerId, pStream->uniqueId, false);
}
}

bool bOk = false;
int packetsTried = 0;

if (nVideoStream != -1)
{
std::unique_ptr<CProcessInfo> pProcessInfo(CProcessInfo::CreateInstance());
std::vector<AVPixelFormat> pixFmts;
pixFmts.push_back(AV_PIX_FMT_YUV420P);
pProcessInfo->SetPixFormats(pixFmts);

CDVDStreamInfo hint(*pDemuxer->GetStream(demuxerId, nVideoStream), true);
hint.codecOptions = CODEC_FORCE_SOFTWARE;

std::unique_ptr<CDVDVideoCodec> pVideoCodec =
CDVDFactoryCodec::CreateVideoCodec(hint, *pProcessInfo);

if (pVideoCodec)
{
int nTotalLen = pDemuxer->GetStreamLength();
int64_t nSeekTo = (pos == -1) ? nTotalLen / 3 : pos;

CLog::Log(LOGDEBUG, "{} - seeking to pos {}ms (total: {}ms) in {}", __FUNCTION__, nSeekTo,
nTotalLen, redactPath);

if (pDemuxer->SeekTime(static_cast<double>(nSeekTo), true))
{
CDVDVideoCodec::VCReturn iDecoderState = CDVDVideoCodec::VC_NONE;
VideoPicture picture = {};

// num streams * 160 frames, should get a valid frame, if not abort.
int abort_index = pDemuxer->GetNrOfStreams() * 160;
do
{
DemuxPacket* pPacket = pDemuxer->Read();
packetsTried++;

if (!pPacket)
break;

if (pPacket->iStreamId != nVideoStream)
{
CDVDDemuxUtils::FreeDemuxPacket(pPacket);
continue;
}

pVideoCodec->AddData(*pPacket);
CDVDDemuxUtils::FreeDemuxPacket(pPacket);

iDecoderState = CDVDVideoCodec::VC_NONE;
while (iDecoderState == CDVDVideoCodec::VC_NONE)
{
iDecoderState = pVideoCodec->GetPicture(&picture);
}

if (iDecoderState == CDVDVideoCodec::VC_PICTURE)
{
if(!(picture.iFlags & DVP_FLAG_DROPPED))
break;
}

} while (abort_index--);

if (iDecoderState == CDVDVideoCodec::VC_PICTURE && !(picture.iFlags & DVP_FLAG_DROPPED))
{
{
unsigned int nWidth = std::min(picture.iDisplayWidth, CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_imageRes);
double aspect = (double)picture.iDisplayWidth / (double)picture.iDisplayHeight;
if(hint.forced_aspect && hint.aspect != 0)
aspect = hint.aspect;
unsigned int nHeight = (unsigned int)((double)nWidth / aspect);

// We pass the buffers to sws_scale uses 16 aligned widths when using intrinsics
int sizeNeeded = FFALIGN(nWidth, 16) * nHeight * 4;
uint8_t *pOutBuf = static_cast<uint8_t*>(av_malloc(sizeNeeded));
struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight,
AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);

if (context)
{
uint8_t *planes[YuvImage::MAX_PLANES];
int stride[YuvImage::MAX_PLANES];
picture.videoBuffer->GetPlanes(planes);
picture.videoBuffer->GetStrides(stride);
uint8_t *src[4]= { planes[0], planes[1], planes[2], 0 };
int srcStride[] = { stride[0], stride[1], stride[2], 0 };
uint8_t *dst[] = { pOutBuf, 0, 0, 0 };
int dstStride[] = { (int)nWidth*4, 0, 0, 0 };
int orientation = DegreeToOrientation(hint.orientation);
sws_scale(context, src, srcStride, 0, picture.iHeight, dst, dstStride);
sws_freeContext(context);

details.width = nWidth;
details.height = nHeight;
CPicture::CacheTexture(pOutBuf, nWidth, nHeight, nWidth * 4, orientation, nWidth, nHeight, CTextureCache::GetCachedPath(details.file));
bOk = true;
}
av_free(pOutBuf);
}
}
else
{
CLog::Log(LOGDEBUG, "{} - decode failed in {} after {} packets.", __FUNCTION__,
redactPath, packetsTried);
}
}
}
}

if (pDemuxer)
delete pDemuxer;

if(!bOk)
{
XFILE::CFile file;
if(file.OpenForWrite(CTextureCache::GetCachedPath(details.file)))
file.Close();
}

auto end = std::chrono::steady_clock::now();
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
CLog::Log(LOGDEBUG, "{} - measured {} ms to extract thumb from file <{}> in {} packets. ",
__FUNCTION__, duration.count(), redactPath, packetsTried);

return bOk;
}

std::unique_ptr<CTexture> CDVDFileInfo::ExtractThumbToTexture(const CFileItem& fileItem)
std::unique_ptr<CTexture> CDVDFileInfo::ExtractThumbToTexture(const CFileItem& fileItem,
int chapterNumber)
{
if (!CanExtract(fileItem))
return {};
Expand All @@ -293,29 +111,16 @@ std::unique_ptr<CTexture> CDVDFileInfo::ExtractThumbToTexture(const CFileItem& f
return {};
}

CDVDDemux* pDemuxer = NULL;

try
{
pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(pInputStream, true);
if (!pDemuxer)
{
CLog::LogF(LOGERROR, "Error creating demuxer");
return {};
}
}
catch (...)
std::unique_ptr<CDVDDemux> demuxer{CDVDFactoryDemuxer::CreateDemuxer(pInputStream, true)};
if (!demuxer)
{
CLog::LogF(LOGERROR, "Exception thrown when opening demuxer");
if (pDemuxer)
delete pDemuxer;

CLog::LogF(LOGERROR, "Error creating demuxer");
return {};
}

int nVideoStream = -1;
int64_t demuxerId = -1;
for (CDemuxStream* pStream : pDemuxer->GetStreams())
for (CDemuxStream* pStream : demuxer->GetStreams())
{
if (pStream)
{
Expand All @@ -326,7 +131,7 @@ std::unique_ptr<CTexture> CDVDFileInfo::ExtractThumbToTexture(const CFileItem& f
demuxerId = pStream->demuxerId;
}
else
pDemuxer->EnableStream(pStream->demuxerId, pStream->uniqueId, false);
demuxer->EnableStream(pStream->demuxerId, pStream->uniqueId, false);
}
}

Expand All @@ -340,30 +145,33 @@ std::unique_ptr<CTexture> CDVDFileInfo::ExtractThumbToTexture(const CFileItem& f
pixFmts.push_back(AV_PIX_FMT_YUV420P);
pProcessInfo->SetPixFormats(pixFmts);

CDVDStreamInfo hint(*pDemuxer->GetStream(demuxerId, nVideoStream), true);
CDVDStreamInfo hint(*demuxer->GetStream(demuxerId, nVideoStream), true);
hint.codecOptions = CODEC_FORCE_SOFTWARE;

std::unique_ptr<CDVDVideoCodec> pVideoCodec =
CDVDFactoryCodec::CreateVideoCodec(hint, *pProcessInfo);

if (pVideoCodec)
{
int nTotalLen = pDemuxer->GetStreamLength();
int64_t nSeekTo = nTotalLen / 3;
int nTotalLen = demuxer->GetStreamLength();

bool seekToChapter = chapterNumber > 0 && demuxer->GetChapterCount() > 0;
int64_t nSeekTo =
seekToChapter ? demuxer->GetChapterPos(chapterNumber) * 1000 : nTotalLen / 3;

CLog::LogF(LOGDEBUG, "seeking to pos {}ms (total: {}ms) in {}", nSeekTo, nTotalLen,
redactPath);

if (pDemuxer->SeekTime(static_cast<double>(nSeekTo), true))
if (demuxer->SeekTime(static_cast<double>(nSeekTo), true))
{
CDVDVideoCodec::VCReturn iDecoderState = CDVDVideoCodec::VC_NONE;
VideoPicture picture = {};

// num streams * 160 frames, should get a valid frame, if not abort.
int abort_index = pDemuxer->GetNrOfStreams() * 160;
int abort_index = demuxer->GetNrOfStreams() * 160;
do
{
DemuxPacket* pPacket = pDemuxer->Read();
DemuxPacket* pPacket = demuxer->Read();
packetsTried++;

if (!pPacket)
Expand Down Expand Up @@ -394,35 +202,33 @@ std::unique_ptr<CTexture> CDVDFileInfo::ExtractThumbToTexture(const CFileItem& f

if (iDecoderState == CDVDVideoCodec::VC_PICTURE && !(picture.iFlags & DVP_FLAG_DROPPED))
{
unsigned int nWidth =
std::min(picture.iDisplayWidth,
CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_imageRes);
double aspect = (double)picture.iDisplayWidth / (double)picture.iDisplayHeight;
if (hint.forced_aspect && hint.aspect != 0)
aspect = hint.aspect;
unsigned int nHeight = (unsigned int)((double)nWidth / aspect);

result = CTexture::CreateTexture(nWidth, nHeight);
result->SetAlpha(false);
struct SwsContext* context =
sws_getContext(picture.iWidth, picture.iHeight, AV_PIX_FMT_YUV420P, nWidth, nHeight,
AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);

if (context)
{
unsigned int nWidth =
std::min(picture.iDisplayWidth,
CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_imageRes);
double aspect = (double)picture.iDisplayWidth / (double)picture.iDisplayHeight;
if (hint.forced_aspect && hint.aspect != 0)
aspect = hint.aspect;
unsigned int nHeight = (unsigned int)((double)nWidth / aspect);

result = CTexture::CreateTexture(nWidth, nHeight);
result->SetAlpha(false);
struct SwsContext* context =
sws_getContext(picture.iWidth, picture.iHeight, AV_PIX_FMT_YUV420P, nWidth, nHeight,
AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);

if (context)
{
uint8_t* planes[YuvImage::MAX_PLANES];
int stride[YuvImage::MAX_PLANES];
picture.videoBuffer->GetPlanes(planes);
picture.videoBuffer->GetStrides(stride);
uint8_t* src[4] = {planes[0], planes[1], planes[2], 0};
int srcStride[] = {stride[0], stride[1], stride[2], 0};
uint8_t* dst[] = {result->GetPixels(), 0, 0, 0};
int dstStride[] = {static_cast<int>(result->GetPitch()), 0, 0, 0};
result->SetOrientation(DegreeToOrientation(hint.orientation));
sws_scale(context, src, srcStride, 0, picture.iHeight, dst, dstStride);
sws_freeContext(context);
}
uint8_t* planes[YuvImage::MAX_PLANES];
int stride[YuvImage::MAX_PLANES];
picture.videoBuffer->GetPlanes(planes);
picture.videoBuffer->GetStrides(stride);
uint8_t* src[4] = {planes[0], planes[1], planes[2], 0};
int srcStride[] = {stride[0], stride[1], stride[2], 0};
uint8_t* dst[] = {result->GetPixels(), 0, 0, 0};
int dstStride[] = {static_cast<int>(result->GetPitch()), 0, 0, 0};
result->SetOrientation(DegreeToOrientation(hint.orientation));
sws_scale(context, src, srcStride, 0, picture.iHeight, dst, dstStride);
sws_freeContext(context);
}
}
else
Expand All @@ -433,9 +239,6 @@ std::unique_ptr<CTexture> CDVDFileInfo::ExtractThumbToTexture(const CFileItem& f
}
}

if (pDemuxer)
delete pDemuxer;

auto end = std::chrono::steady_clock::now();
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
CLog::LogF(LOGDEBUG, "measured {} ms to extract thumb from file <{}> in {} packets. ",
Expand Down
6 changes: 2 additions & 4 deletions xbmc/cores/VideoPlayer/DVDFileInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ class CTextureDetails;
class CDVDFileInfo
{
public:
// Extract a thumbnail image from the media referenced by fileItem
static bool ExtractThumb(const CFileItem& fileItem, CTextureDetails& details, int64_t pos);

static std::unique_ptr<CTexture> ExtractThumbToTexture(const CFileItem& fileItem);
static std::unique_ptr<CTexture> ExtractThumbToTexture(const CFileItem& fileItem,
int chapterNumber = 0);

/*!
* @brief Can a thumbnail image and file stream details be extracted from this file item?
Expand Down
2 changes: 2 additions & 0 deletions xbmc/imagefiles/SpecialImageLoaderFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "guilib/Texture.h"
#include "music/MusicEmbeddedImageFileLoader.h"
#include "pictures/PictureFolderImageFileLoader.h"
#include "video/VideoChapterImageFileLoader.h"
#include "video/VideoEmbeddedImageFileLoader.h"
#include "video/VideoGeneratedImageFileLoader.h"

Expand All @@ -22,6 +23,7 @@ CSpecialImageLoaderFactory::CSpecialImageLoaderFactory()
m_specialImageLoaders[1] = std::make_unique<MUSIC_INFO::CMusicEmbeddedImageFileLoader>();
m_specialImageLoaders[2] = std::make_unique<VIDEO::CVideoGeneratedImageFileLoader>();
m_specialImageLoaders[3] = std::make_unique<CPictureFolderImageFileLoader>();
m_specialImageLoaders[4] = std::make_unique<VIDEO::CVideoChapterImageFileLoader>();
}

std::unique_ptr<CTexture> CSpecialImageLoaderFactory::Load(const std::string& specialType,
Expand Down
Loading

0 comments on commit c57bca1

Please sign in to comment.