Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-17 15:42:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AVC/h.264: only forcefully flag the very first frame as an I frame

Browse Source
This commit is contained in:
Moritz Bunkus 2014-11-17 13:00:21 +01:00
parent 356f91c5ba
commit 5c54f887f7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/mpeg4_p10.cpp
View File

@ -993,6 +993,7 @@ mpeg4::p10::avc_es_parser_c::avc_es_parser_c()
, m_ignore_nalu_size_length_errors(false) , m_ignore_nalu_size_length_errors(false)
, m_discard_actual_frames(false) , m_discard_actual_frames(false)
, m_simple_picture_order{} , m_simple_picture_order{}
, m_first_cleanup{true}
, m_debug_keyframe_detection{"avc_parser|avc_keyframe_detection"} , m_debug_keyframe_detection{"avc_parser|avc_keyframe_detection"}
, m_debug_nalu_types{ "avc_parser|avc_nalu_types"} , m_debug_nalu_types{ "avc_parser|avc_nalu_types"}
, m_debug_timecodes{ "avc_parser|avc_timecodes"} , m_debug_timecodes{ "avc_parser|avc_timecodes"}
@ -1715,7 +1716,10 @@ mpeg4::p10::avc_es_parser_c::cleanup() {
// This may be wrong but is needed for mkvmerge to work correctly // This may be wrong but is needed for mkvmerge to work correctly
// (cluster_helper etc). // (cluster_helper etc).
frames_begin->m_keyframe = true; if (m_first_cleanup) {
frames_begin->m_keyframe = true;
m_first_cleanup = false;
}
for (frame_itr = frames_begin; frames_end != frame_itr; ++frame_itr) { for (frame_itr = frames_begin; frames_end != frame_itr; ++frame_itr) {
if (frames_begin != frame_itr) if (frames_begin != frame_itr)

2
src/common/mpeg4_p10.h
View File

@ -263,7 +263,7 @@ protected:
bool m_have_incomplete_frame; bool m_have_incomplete_frame;
std::deque<memory_cptr> m_unhandled_nalus; std::deque<memory_cptr> m_unhandled_nalus;
bool m_ignore_nalu_size_length_errors, m_discard_actual_frames, m_simple_picture_order; bool m_ignore_nalu_size_length_errors, m_discard_actual_frames, m_simple_picture_order, m_first_cleanup;
debugging_option_c m_debug_keyframe_detection, m_debug_nalu_types, m_debug_timecodes, m_debug_sps_info, m_debug_trailing_zero_byte_removal; debugging_option_c m_debug_keyframe_detection, m_debug_nalu_types, m_debug_timecodes, m_debug_sps_info, m_debug_trailing_zero_byte_removal;
std::map<int, std::string> m_nalu_names_by_type; std::map<int, std::string> m_nalu_names_by_type;