Skip to content

Partial support for videos with variable resolution #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szlldm wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Partial support for videos with variable resolution #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c9f761e
[ADM_editor] partial support for videos with variable resolution
szlldm Feb 5, 2022
70a4f40
[decoderFF] report uncompressed frame resolution
szlldm Feb 5, 2022
114d218
[aom] report uncompressed frame resolution
szlldm Feb 5, 2022
36905bb
[vpx] report uncompressed frame resolution
szlldm Feb 5, 2022
17cb65e
[vdpau] report uncompressed frame resolution
szlldm Feb 5, 2022
c8a59d7
[libva] report uncompressed frame resolution
szlldm Feb 6, 2022
eabd686
[dxva2] report uncompressed frame resolution
szlldm Feb 6, 2022
3f3dbb6
[ADM_editor] handle unsupported hw decoder(s) gently
szlldm Feb 6, 2022
82c35f8
[ADM_editor] only sw decoder support for videos with variable resolution
szlldm Feb 7, 2022
6582d90
[MpegTS] modified resolution change warning message
szlldm Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions avidemux/common/ADM_editor/include/ADM_edit.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ protected:
ADM_PP *_pp; // Postprocessing settings
ADMToneMapperConfig *_hdrConfig;
ADMImage *_imageBuffer; // Temp buffer used for decoding
ADMColorScalerFull *_rescueScaler;
int _rescueScalerWidth, _rescueScalerHeight;
ADM_pixelFormat _rescueScalerPixFmt;
uint64_t _currentPts; // Current image PTS
uint32_t _currentSegment; // Current video segment
int64_t _nextFrameDts; // COPYMODE Used in copy mode to fill the missing timestamp
Expand Down
35 changes: 35 additions & 0 deletions avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,41 @@ bool ADM_Composer::decompressImage(ADMImage *out,ADMCompressedImage *in,uint32_t
return true;
}

// handle if decoded frame resolution changed !?!
if ((tmpImage->_width != _imageBuffer->_width) || (tmpImage->_height != _imageBuffer->_height))
{
if (!refOnly)
ADM_assert(0);
if(tmpImage->refType == ADM_HW_NONE)
{
if (_rescueScaler == NULL)
{
_rescueScaler = new ADMColorScalerFull(ADM_CS_BICUBIC,tmpImage->_width,tmpImage->_height,_imageBuffer->_width,_imageBuffer->_height,tmpImage->_pixfrmt,ADM_PIXFRMT_YV12);
_rescueScalerWidth = tmpImage->_width;
_rescueScalerHeight = tmpImage->_height;
_rescueScalerPixFmt = tmpImage->_pixfrmt;

}
else
if ((tmpImage->_width != _rescueScalerWidth) || (tmpImage->_height != _rescueScalerHeight) || (_rescueScalerPixFmt != tmpImage->_pixfrmt))
{
_rescueScaler->reset(ADM_CS_BICUBIC,tmpImage->_width,tmpImage->_height,_imageBuffer->_width,_imageBuffer->_height,tmpImage->_pixfrmt,ADM_PIXFRMT_YV12);
_rescueScalerWidth = tmpImage->_width;
_rescueScalerHeight = tmpImage->_height;
_rescueScalerPixFmt = tmpImage->_pixfrmt;
}

_rescueScaler->convertImage(tmpImage,_imageBuffer);
_imageBuffer->copyInfo(tmpImage);
tmpImage = _imageBuffer;
}
else // HW image unsupported
{
return false;
}
}


if (_blankImageForInfo==NULL)
{
_blankImageForInfo = new ADMImageRef(tmpImage->_width,tmpImage->_height);
Expand Down
11 changes: 11 additions & 0 deletions avidemux/common/ADM_editor/src/ADM_edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ ADM_Composer::ADM_Composer (void)
_pp=NULL;
_hdrConfig=NULL;
_imageBuffer=NULL;
_rescueScaler=NULL;
_internalFlags=0;
_currentSegment=0;
_scratch=NULL;
Expand Down Expand Up @@ -585,6 +586,11 @@ uint8_t ADM_Composer::addFile (const char *name)
delete _imageBuffer;
_imageBuffer=NULL;
}
if (_rescueScaler)
{
delete _rescueScaler;
_rescueScaler=NULL;
}
_imageBuffer=new ADMImageDefault(info.width,info.height);
_imageBuffer->_qSize= ((info.width+15)>>4)*((info.height+15)>>4);
_imageBuffer->quant=new uint8_t[_imageBuffer->_qSize];
Expand Down Expand Up @@ -950,6 +956,11 @@ uint8_t ADM_Composer::cleanup (void)
delete _imageBuffer;
_imageBuffer=NULL;
}
if (_rescueScaler)
{
delete _rescueScaler;
_rescueScaler=NULL;
}

if (_blankImageForInfo)
{
Expand Down
2 changes: 2 additions & 0 deletions avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@ bool decoderFFDXVA2::readBackBuffer(AVFrame *decodedFrame, ADMCompressedImag
out->refDescriptor.refMarkUsed =dxvaMarkSurfaceUsed;
out->refDescriptor.refMarkUnused=dxvaMarkSurfaceUnused;
out->refDescriptor.refDownload =dxvaRefDownload;
out->_width = decodedFrame->width; // out is ref, we can do this
out->_height = decodedFrame->height;
return true;
}
//---
Expand Down
2 changes: 2 additions & 0 deletions avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,8 @@ bool decoderFFLIBVA::readBackBuffer(AVFrame *decodedFrame, ADMCompressedImag
out->refDescriptor.refMarkUsed=libvaMarkSurfaceUsed;
out->refDescriptor.refMarkUnused=libvaMarkSurfaceUnused;
out->refDescriptor.refDownload=libvaRefDownload;
out->_width = decodedFrame->width; // out is ref, we can do this
out->_height = decodedFrame->height;
return true;
}

Expand Down
2 changes: 2 additions & 0 deletions avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,8 @@ bool decoderFFVDPAU::readBackBuffer(AVFrame *decodedFrame, ADMCompressedImag
out->Pts= (uint64_t)(pts_opaque);
out->flags=admFrameTypeFromLav(decodedFrame);
out->_range=(decodedFrame->color_range==AVCOL_RANGE_JPEG)? ADM_COL_RANGE_JPEG : ADM_COL_RANGE_MPEG;
out->_width = decodedFrame->width; // out is ref, we can do this
out->_height = decodedFrame->height;
return true;
}

Expand Down
2 changes: 2 additions & 0 deletions avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ uint8_t decoderFF::clonePic (AVFrame * src, ADMImage * out, bool swap)
break;
}
}
out->_width = src->width; // out is ref, we can do this
out->_height = src->height;

return 1;
}
Expand Down
8 changes: 5 additions & 3 deletions avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,13 @@ uint8_t TsIndexerH264::run(const char *file, ADM_TS_TRACK *videoTrac)
spsInfo.width, spsInfo.height, tmpInfo.width, tmpInfo.height, data.nbPics, thisUnit.packetInfo.startAt);
char alert[1024];
alert[0]='\0';
snprintf(alert,1024,QT_TRANSLATE_NOOP("tsdemuxer","The size of the video changes at frame %u "
"from %ux%u to %ux%u. This is unsupported and will result in a crash.\n"
snprintf(alert,1024,QT_TRANSLATE_NOOP("tsdemuxer","The resolution of the video changes from %ux%u to %ux%u "
"at frame %u.\nIf hardware decoders are enabled, this will result in a crash.\n"
"Software decoder will scale every frame to %ux%u.\n"
"Scaling will affect re-encode, but not copy mode.\n"
"Proceed nevertheless?\n"
"This warning won't be shown again for this video."),
data.nbPics, spsInfo.width, spsInfo.height, tmpInfo.width, tmpInfo.height);
spsInfo.width, spsInfo.height, tmpInfo.width, tmpInfo.height, data.nbPics, spsInfo.width, spsInfo.height);
alert[1023]='\0';
if(!warningIgnored && !GUI_Question(alert,true))
{
Expand Down
8 changes: 5 additions & 3 deletions avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,13 @@ uint8_t result=1;
video.w, video.h, widthToCheck, heightToCheck, data.nbPics, spsUnit.packetInfo.startAt);
char alert[1024];
alert[0]='\0';
snprintf(alert,1024,QT_TRANSLATE_NOOP("tsdemuxer","The size of the video changes at frame %u "
"from %ux%u to %ux%u. This is unsupported and will result in a crash.\n"
snprintf(alert,1024,QT_TRANSLATE_NOOP("tsdemuxer","The resolution of the video changes from %ux%u to %ux%u "
"at frame %u.\nIf hardware decoders are enabled, this will result in a crash.\n"
"Software decoder will scale every frame to %ux%u.\n"
"Scaling will affect re-encode, but not copy mode.\n"
"Proceed nevertheless?\n"
"This warning won't be shown again for this video."),
data.nbPics, video.w, video.h, widthToCheck, heightToCheck);
video.w, video.h, widthToCheck, heightToCheck, data.nbPics, video.w, video.h);
alert[1023]='\0';
if(!warningIgnored && !GUI_Question(alert,true))
goto the_end;
Expand Down
2 changes: 2 additions & 0 deletions avidemux_plugins/ADM_videoDecoder/aom/ADM_aomDec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ bool decoderAom::uncompress(ADMCompressedImage *in, ADMImage *out)

r->Pts=in->demuxerPts;
r->flags=in->flags;
r->_width = img->w;
r->_height = img->h;
// make sure the output is not marked as a hw image
int count = 0;
while(r->refType != ADM_HW_NONE && count < 32 /* arbitrary limit */)
Expand Down
2 changes: 2 additions & 0 deletions avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ bool decoderVPX::uncompress (ADMCompressedImage * in, ADMImage * out)
r->_pixfrmt=ADM_PIXFRMT_YV12;
r->Pts=in->demuxerPts;
r->flags=in->flags;
r->_width = img->w;
r->_height = img->h;
return true;
}

Expand Down