Improve video decoder seeking and reset behavior #5830
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joaquin Anton Guirao <[email protected]>
JanuszL
reviewed
Feb 25, 2025
| } | ||
| } | ||
|
|
||
| if (av_state_->codec_params_->codec_type != AVMEDIA_TYPE_VIDEO) { |
There was a problem hiding this comment.
Where av_state_->codec_params_->codec_type from if av_state_->codec_params_->codec_type is false?
JanuszL
reviewed
Feb 25, 2025
| @@ -282,6 +293,7 @@ class DLL_PUBLIC FramesDecoderBase { | |||
| std::optional<MemoryVideoFile> memory_video_file_ = {}; | |||
|
|
|||
| std::optional<int> num_frames_ = {}; | |||
| std::optional<bool> is_seekable_ = {}; | |||
There was a problem hiding this comment.
Does it need to be optional?
JanuszL
reviewed
Feb 25, 2025
Comment on lines
626
to
628
| if (!is_seekable_.has_value()) { | ||
| is_seekable_ = ret >= 0; | ||
| } |
JanuszL
reviewed
Feb 25, 2025
Comment on lines
653
to
657
| uint8_t *av_io_buffer = static_cast<uint8_t *>(av_malloc(default_av_buffer_size)); | ||
| AVIOContext *av_io_context = avio_alloc_context( | ||
| av_io_buffer, default_av_buffer_size, 0, &memory_video_file_.value(), | ||
| detail::read_memory_video_file, nullptr, detail::seek_memory_video_file); | ||
| av_state_->ctx_->pb = av_io_context; |
There was a problem hiding this comment.
- What if allocation fails?
- Shouldn't we clean up
av_state_->ctx_->pb?
auto custom_ctx = ctx_->pb;
auto custom_buffer = ctx_->pb ? ctx_->pb->buffer : nullptr;
if (custom_dealloc) {
av_freep(&custom_buffer);
avio_context_free(&custom_ctx);
}
There was a problem hiding this comment.
- I'll handle that
- No need, it already gets cleaned up when we do
av_state_ = std::make_unique<AvState>();
jantonguirao
force-pushed
the
video_changes
branch
2 times, most recently
from
3f64339 to
40dd932
Compare
|
!build |
|
CI MESSAGE: [24605517]: BUILD STARTED |
JanuszL
reviewed
Feb 26, 2025
| int AvState::OpenFile(const std::string& filename) { | ||
| LOG_LINE << "Opening file " << filename << std::endl; | ||
| CloseInput(); | ||
| DALI_ENFORCE((ctx_ = avformat_alloc_context()), "Could not alloc avformat context"); |
There was a problem hiding this comment.
I'm not sure if we should put assignment to DALI_ENFORCE
JanuszL
approved these changes
Feb 26, 2025
Signed-off-by: Joaquin Anton Guirao <[email protected]>
jantonguirao
force-pushed
the
video_changes
branch
from
40dd932 to
28b9821
Compare
Signed-off-by: Joaquin Anton Guirao <[email protected]>
|
CI MESSAGE: [24606155]: BUILD STARTED |
|
CI MESSAGE: [24606525]: BUILD STARTED |
Signed-off-by: Joaquin Anton Guirao <[email protected]>
|
CI MESSAGE: [24611381]: BUILD STARTED |
|
CI MESSAGE: [24611422]: BUILD STARTED |
mdabek-nvidia
approved these changes
Feb 26, 2025
JanuszL
approved these changes
Feb 26, 2025
|
CI MESSAGE: [24606525]: BUILD FAILED |
|
CI MESSAGE: [24606155]: BUILD FAILED |
rostan-t
reviewed
Feb 27, 2025
| } | ||
| av_state_->frame_ = av_frame_alloc(); | ||
| if (ret != 0) { |
There was a problem hiding this comment.
Typo?
Suggested change
| if (ret != 0) { | |
| if (av_state_->frame_ == nullptr) { |
|
CI MESSAGE: [24611381]: BUILD FAILED |
|
CI MESSAGE: [24611422]: BUILD FAILED |
Signed-off-by: Joaquin Anton Guirao <[email protected]>
|
CI MESSAGE: [24670395]: BUILD STARTED |
Signed-off-by: Joaquin Anton Guirao <[email protected]>
|
CI MESSAGE: [24670395]: BUILD PASSED |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Category:
Refactoring / New feature / Bug fix
Description:
Additional information:
Affected modules and functionalities:
Key points relevant for the review:
Tests:
Checklist
Documentation
DALI team only
Requirements
REQ IDs: N/A
JIRA TASK: N/A