- Notifications
You must be signed in to change notification settings - Fork50
Add analyse level full#291
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
19 commits Select commitHold shift + click to select a range
dffb65a file: add eAnalyseLevelFull level
525f0aa VideoProperties: add analyseFull private method which decodes all the…
8861e17 Merge branch 'develop' of https://github.com/avTranscoder/avTranscode…
16aafd0 VideoProperties: fix compilation since updates of VideoFrameDesc
c33fb0f VideoProperties: analyseGopStructure returns nb decoded frames
ac763ff VideoProperties: fix nb decoded frames in analyseFull method
465af95 VideoProperties: refactor seek to the beginning of the file after ana…
b112ba8 VideoProperties: add progress callback in analyseFull method
604d7a8 VideoProperties: update log when estimate bitrate / duration
eb7442d VideoProperties: refactor how to return the number of frames
b6978bc VideoProperties: in case of full analysis get the exact duration
b01356f VideoProperties: add log when no need to decode all the stream in cas…
b977583 VideoProperties: fix progress of full analysis
d853c8c pyTest: add a test to check full analysis of a raw video stream
7f1077f avMeta: use eAnalyseLevelFull level
84fc4bf VideoProperties: add const to local variables of getNbFrames
ad44be7 VideoProperties: refactor how to launch deeper analysis
a61d95f VideoProperties: refactor how to getDuration
0f7508f VideoProperties: refactor how to getNbFrames
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
6 changes: 3 additions & 3 deletionsapp/avMeta/avMeta.cpp
This file contains hidden or 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
2 changes: 1 addition & 1 deletionsrc/AvTranscoder/file/util.hpp
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -11,7 +11,7 @@ enum EAnalyseLevel | ||
| { | ||
| eAnalyseLevelHeader =0, | ||
| eAnalyseLevelFirstGop =1, | ||
| eAnalyseLevelFull =2 | ||
| }; | ||
| } | ||
130 changes: 96 additions & 34 deletionssrc/AvTranscoder/properties/VideoProperties.cpp
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -29,6 +29,7 @@ VideoProperties::VideoProperties(const FileProperties& fileProperties, const siz | ||
| , _isTopFieldFirst(false) | ||
| , _gopSize(0) | ||
| , _gopStructure() | ||
| , _nbFrames(0) | ||
| , _firstGopTimeCode(-1) | ||
| { | ||
| if(_codecContext) | ||
| @@ -37,8 +38,23 @@ VideoProperties::VideoProperties(const FileProperties& fileProperties, const siz | ||
| _firstGopTimeCode = _codecContext->timecode_frame_start; | ||
| } | ||
| switch(_levelAnalysis) | ||
| { | ||
| case eAnalyseLevelFirstGop: | ||
| analyseGopStructure(progress); | ||
| break; | ||
| case eAnalyseLevelFull: | ||
| analyseFull(progress); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| if(_levelAnalysis > eAnalyseLevelHeader) | ||
| { | ||
| // Returns at the beginning of the stream | ||
| const_cast<InputFile&>(_fileProperties->getInputFile()).seekAtFrame(0, AVSEEK_FLAG_BYTE); | ||
| } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Shouldn't we use a switch statement here? We might have this There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Something like that?ad44be7 | ||
| } | ||
| std::string VideoProperties::getProfileName() const | ||
| @@ -329,11 +345,11 @@ size_t VideoProperties::getBitRate() const | ||
| // return bit rate of stream if present or VBR mode | ||
| if(_codecContext->bit_rate || _codecContext->rc_max_rate) | ||
| return _codecContext->bit_rate; | ||
| LOG_WARN("The bitrate of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown.") | ||
| if(_levelAnalysis == eAnalyseLevelHeader) | ||
| { | ||
| LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.") | ||
| return 0; | ||
| } | ||
| @@ -364,21 +380,26 @@ size_t VideoProperties::getNbFrames() const | ||
| { | ||
| if(!_formatContext) | ||
| throw std::runtime_error("unknown format context"); | ||
| const size_t nbFrames = _formatContext->streams[_streamIndex]->nb_frames; | ||
| if(nbFrames) | ||
| return nbFrames; | ||
| LOG_WARN("The number of frames of the stream '" << _streamIndex << "' of file '" << _formatContext->filename | ||
| << "' is unknown.") | ||
| if(_levelAnalysis == eAnalyseLevelHeader) | ||
| { | ||
| LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.") | ||
| return 0; | ||
| } | ||
| if(! _nbFrames) | ||
| { | ||
| LOG_INFO("Estimate the number of frames from the fps and the duration.") | ||
| return getFps() * getDuration(); | ||
| } | ||
| LOG_INFO("Get the exact number of frames.") | ||
| return _nbFrames; | ||
| } | ||
| size_t VideoProperties::getTicksPerFrame() const | ||
| @@ -445,18 +466,23 @@ float VideoProperties::getDuration() const | ||
| const float duration = StreamProperties::getDuration(); | ||
| if(duration != 0) | ||
| return duration; | ||
| LOG_WARN("The duration of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown.") | ||
| if(_levelAnalysis == eAnalyseLevelHeader) | ||
| { | ||
| LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.") | ||
| return 0; | ||
| } | ||
| if(! _nbFrames) | ||
| { | ||
| LOG_INFO("Estimate theduration from the file size andthebitrate.") | ||
| const size_t bitRate = getBitRate(); | ||
| if(bitRate) | ||
| return _fileProperties->getFileSize() / bitRate * 8; | ||
| } | ||
| LOG_INFO("Get the exact duration from the number of frames and the fps.") | ||
| return _nbFrames / getFps(); | ||
| } | ||
| bool VideoProperties::hasBFrames() const | ||
| @@ -503,24 +529,24 @@ std::vector<std::pair<char, int> > VideoProperties::getGopStructure() const | ||
| return _gopStructure; | ||
| } | ||
| size_t VideoProperties::analyseGopStructure(IProgress& progress) | ||
| { | ||
| if(! _formatContext || ! _codecContext || ! _codec) | ||
| return 0; | ||
| if(! _codecContext->width || ! _codecContext->height) | ||
| return 0; | ||
| InputFile& file = const_cast<InputFile&>(_fileProperties->getInputFile()); | ||
| // Get the stream | ||
| IInputStream& stream = file.getStream(_streamIndex); | ||
| stream.activate(); | ||
| // Create a decoder | ||
| VideoDecoder decoder(static_cast<InputStream&>(stream)); | ||
| VideoFrame frame(VideoFrameDesc(getWidth(), getHeight(), getPixelFormatName(getPixelProperties().getAVPixelFormat())), false); | ||
| size_tnbDecodedFrames = 0; | ||
| int positionOfFirstKeyFrame = -1; | ||
| int positionOfLastKeyFrame = -1; | ||
| while(decoder.decodeNextFrame(frame)) | ||
| { | ||
| AVFrame& avFrame = frame.getAVFrame(); | ||
| @@ -532,12 +558,12 @@ void VideoProperties::analyseGopStructure(IProgress& progress) | ||
| if(avFrame.pict_type == AV_PICTURE_TYPE_I) | ||
| { | ||
| if(positionOfFirstKeyFrame == -1) | ||
| positionOfFirstKeyFrame =nbDecodedFrames; | ||
| else | ||
| positionOfLastKeyFrame =nbDecodedFrames; | ||
| } | ||
| _gopSize = ++nbDecodedFrames; | ||
| // If the first 2 key frames are found | ||
| if(positionOfFirstKeyFrame != -1 && positionOfLastKeyFrame != -1) | ||
| @@ -551,14 +577,50 @@ void VideoProperties::analyseGopStructure(IProgress& progress) | ||
| } | ||
| } | ||
| // Check GOP size | ||
| if(_gopSize <= 0) | ||
| { | ||
| throw std::runtime_error("Invalid GOP size when decoding the first data."); | ||
| } | ||
| return nbDecodedFrames; | ||
| } | ||
| size_t VideoProperties::analyseFull(IProgress& progress) | ||
| { | ||
| const size_t nbDecodedFrames = analyseGopStructure(progress); | ||
| if(! _fileProperties->isRawFormat()) | ||
| { | ||
| LOG_INFO("No need to decode all the stream to get more information.") | ||
| return nbDecodedFrames; | ||
| } | ||
| if(! _formatContext || ! _codecContext || ! _codec) | ||
| return 0; | ||
| if(! _codecContext->width || ! _codecContext->height) | ||
| return 0; | ||
| InputFile& file = const_cast<InputFile&>(_fileProperties->getInputFile()); | ||
| // Get the stream | ||
| IInputStream& stream = file.getStream(_streamIndex); | ||
| stream.activate(); | ||
| // Create a decoder | ||
| VideoDecoder decoder(static_cast<InputStream&>(stream)); | ||
| VideoFrame frame(VideoFrameDesc(getWidth(), getHeight(), getPixelFormatName(getPixelProperties().getAVPixelFormat())), false); | ||
| const size_t estimateNbFrames = getNbFrames(); | ||
| _nbFrames = nbDecodedFrames; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Does this have a real sense to set the number of images with the GOP image number? | ||
| while(decoder.decodeNextFrame(frame)) | ||
| { | ||
| progress.progress(++_nbFrames, estimateNbFrames); | ||
| } | ||
| // Check GOP size | ||
| if(_nbFrames <= 0) | ||
| { | ||
| throw std::runtime_error("Invalid number of frames when decoding the video stream."); | ||
| } | ||
| return _nbFrames; | ||
| } | ||
| PropertyVector& VideoProperties::fillVector(PropertyVector& data) const | ||
21 changes: 17 additions & 4 deletionssrc/AvTranscoder/properties/VideoProperties.hpp
This file contains hidden or 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
28 changes: 28 additions & 0 deletionstest/pyTest/testInputFile.py
This file contains hidden or 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
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.